1.develop

build.gradle

@@ -70,6 +70,7 @@ dependencies {
 	implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 	implementation 'com.tencentcloudapi:tencentcloud-sdk-java:3.1.874'
 	implementation 'org.redisson:redisson-spring-boot-starter:3.23.5'
+	implementation 'com.github.tencentyun:tls-sig-api-v2:2.0'
 
 
 

src/main/java/com/xwd/hospital/server/constants/Constant.java

@@ -7,7 +7,11 @@ public class Constant {
     public static final String SMS_PREFIX = "sms_code_login_";
     public static final String DOCTOR_ASKS = "DOCTOR_ASKS";
     /**
-     * 订单未支付到期自动取消，15分钟
+     * 订单未支付到期自动取消，30分钟
      */
-    public static final Integer ORDER_PAY_WAIT_TIME = 5*60*1000;
+    public static final Integer ORDER_PAY_WAIT_TIME = 30*60*1000;
+    /**
+     * 小号池大小
+     */
+    public static final Integer PROXY_NUMBER_LIMIT = 2;
 }

src/main/java/com/xwd/hospital/server/rest/MedicalReportController.java

@@ -100,4 +100,15 @@ public class MedicalReportController extends BaseController<MedicalReportService
         return ApiResponse.ok(this.service.uploadReport(dto));
     }
 
+    /**
+     * 我的医嘱
+     *
+     */
+    @GetMapping("/myDoctorAsk")
+    @Operation(summary = "我的医嘱")
+    public ApiResponse myDoctorAsk(@AuthUser User user) {
+
+        return ApiResponse.ok(this.service.myDoctorAsk());
+    }
+
 }

src/main/java/com/xwd/hospital/server/service/MedicalReportService.java

@@ -18,4 +18,6 @@ public interface MedicalReportService extends BaseService<MedicalReport> {
 
     boolean uploadReport(ReportDto dto);
 
+    MedicalReport myDoctorAsk();
+
 }

src/main/java/com/xwd/hospital/server/service/impl/MedicalReportServiceImpl.java

@@ -13,9 +13,15 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.xwd.hospital.server.domain.MedicalReportPicture;
+import com.xwd.hospital.server.domain.User;
+import com.xwd.hospital.server.domain.UserInfo;
 import com.xwd.hospital.server.dto.ReportDto;
+import com.xwd.hospital.server.enums.ReportStateEnum;
 import com.xwd.hospital.server.service.MedicalReportPictureService;
+import com.xwd.hospital.server.service.UserInfoService;
+import com.xwd.hospital.server.service.UserService;
 import jakarta.annotation.Resource;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -34,6 +40,10 @@ public class MedicalReportServiceImpl extends ServiceImpl<MedicalReportMapper, M
 
     @Resource
     private MedicalReportPictureService pictureService;
+    @Resource
+    private UserInfoService userInfoService;
+    @Resource
+    private UserService userService;
 
     @Override
     public int updateAllFieldsById(MedicalReport entity) {
@@ -83,4 +93,22 @@ public class MedicalReportServiceImpl extends ServiceImpl<MedicalReportMapper, M
 
         return true;
     }
+
+    @Override
+    public MedicalReport myDoctorAsk() {
+        //当前用户
+        Object userId = StpUtil.getExtra("userId");
+        UserInfo userInfo = userInfoService.getOne(Wrappers.<UserInfo>query().eq("user_id", Long.valueOf(userId.toString())));
+        if(null == userInfo){
+            return null;
+        }
+        User sysUser = userService.getById(Long.valueOf(userId.toString()));
+
+        //根据medical_report中的身份证号查询和报告状态查询，查询报告状态为INTERPRETED下的最新一条医嘱，如果没有数据则查询报告状态为CONFIRMED下的最新一条医嘱
+        MedicalReport medicalReport = this.getOne(Wrappers.<MedicalReport>query()
+                .eq("patient_id_no", userInfo.getIdNo())
+                .and(i -> i.eq("report_state", ReportStateEnum.INTERPRETED).or().eq("report_state", ReportStateEnum.CONFIRMED))
+                .orderByDesc("report_state").orderByDesc("createtime").last("limit 1"));
+        return medicalReport;
+    }
 }

src/main/java/com/xwd/hospital/server/service/impl/OrderServiceImpl.java

@@ -67,6 +67,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Resource
     private DelayQueueService delayQueueService;
 
+    /**
+     * 计数count
+     */
+    private Integer count = 0;
+
     @Override
     public int updateAllFieldsById(Order entity) {
         return this.getBaseMapper().updateAllFieldsById(entity);
@@ -433,11 +438,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             //绑定小号和患者号码并返回小号
             PhoneOrderRecord record = phoneOrderRecordService.getOne(Wrappers.<PhoneOrderRecord>query().eq("order_no", orderNo));
-            if(!StringUtils.isBlank(record.getProxyPhoneNo() )
-                &&record.getMappingState() == YesNoEnum.NO){
-                return record.getProxyPhoneNo();
-
-            }
+//            if(!StringUtils.isBlank(record.getProxyPhoneNo() )
+//                &&record.getMappingState() == YesNoEnum.NO){
+//                return record.getProxyPhoneNo();
+//
+//            }
             //todo 从小号列表中获取到合适的小号(sys_setting表)
             List<Setting> settingList = settingService.list(Wrappers.<Setting>query().eq("name", SysSettingEnum.PROXY_PHONE));
             if(null == settingList
@@ -445,7 +450,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 //暂无可用来绑定的小号
                 return null;
             }
-            Setting setting = settingList.get(0);
+            Setting setting = settingList.get(count);
             proxyNumber = setting.getValue();
 
             //绑定小号和患者号码
@@ -457,6 +462,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //小号改为已使用
             setting.setRemark(UseStateEnum.USED.getName());
             settingService.saveOrUpdate(setting);
+
+            if(Constant.PROXY_NUMBER_LIMIT == count){
+                count = 0;
+            }else {
+                count++;
+            }
+
         }
 
         return proxyNumber;

src/main/java/com/xwd/hospital/server/service/impl/SmsServiceImpl.java

@@ -163,6 +163,7 @@ public class SmsServiceImpl implements SmsService {
         Call<JsonObject> call = service.bindNumber(headers, bindNumberReq, account, sigAndAuth.get("sig"));
         try {
             Response<JsonObject> execute = call.execute();
+            log.info("返回结果{}",execute.toString());
             mappingId = execute.body().get("mappingId").getAsString();
             log.info("绑定成功---------");
         } catch (IOException e) {