更新自助预约和核酸检验下单接口。

src/main/java/thyyxxk/wxservice_server/entity/bookable/Prescription.java

@@ -15,27 +15,27 @@ import java.util.List;
 public class Prescription {
     private String patientId;
     private String visitDeptCode;
-    private String doctorCode = "99999";
-    private String inspectPart = "";
-    private String reqComment = "";
-    private String reqTzComment = "";
-    private String birthDate;
+    private String doctorCode = "";
+    private String firstOrNot = "0";
     private String icdCode = "ZD001";
     private String icdText = "";
-    private Integer jzFlag = 0;
+    private String serialNo = "";
     private MzBlRecord mzBlRecord = new MzBlRecord();
     private List<HashMap<String, String>> mzChargeDetailList = new ArrayList<>();
     private List<HashMap<String, String>> mzYjReqList;
 
     public void initMzYjReqList(BookedYjReq book) {
         setPatientId(book.getPatientId());
-        setVisitDeptCode(book.getExecUnit());
-        setReqComment("自助开单-" + book.getName());
-        setReqTzComment("自助开单-" + book.getName());
+        setVisitDeptCode("");
         setIcdText("自助开单-" + book.getName());
         mzYjReqList = new ArrayList<>();
         HashMap<String, String> map = new HashMap<>(1);
         map.put("orderCode", book.getCode());
+        map.put("inspectPart", "");
+        map.put("inspectStuff", "");
+        map.put("instructionCode", "");
+        map.put("instructionText", "");
+        map.put("orderNo", "2");
         mzYjReqList.add(map);
     }
 }

src/main/java/thyyxxk/wxservice_server/entity/covid/MzBlRecord.java

@@ -18,4 +18,15 @@ public class MzBlRecord {
     private String emrYypg = "无";
     private String emrGnpg = "无";
     private String emrJkjy = "无";
+    private String personalHistory = "";
+    private String familyHistory = "";
+    private String obstericalHistory = "";
+    private String weight = "0";
+    private String temperature = "0";
+    private String sphygmus = "0";
+    private String breathe = "0";
+    private String pressureHigh = "0";
+    private String pressureFloor = "0";
+    private String pressureHighLeft = "0";
+    private String pressureFloorLeft = "0";
 }

src/main/java/thyyxxk/wxservice_server/service/BookableService.java

@@ -155,12 +155,19 @@ public class BookableService {
             charge.put("frequency", "QD");
             charge.put("orderDays", "1");
             charge.put("paySelf", "0");
+            charge.put("instructionCode", "");
+            charge.put("instructionText", "");
+            charge.put("orderNo", "1");
+            charge.put("groupOrder", "");
             charge.put("supplyCode", "003");
-            charge.put("supplyAmount", "1");
-            charge.put("supplyExec", param.getExecUnit());
+            charge.put("cyJssm", "");
+            charge.put("cyDj", "");
+            charge.put("cyFysm", "");
+            charge.put("tryFlag", "0");
+            charge.put("groupNo", "");
             book.getMzChargeDetailList().add(charge);
         }
-
+        log.info("自助开单预约：{}", JSONObject.toJSONString(book));
         RestTemplate restTemplate = new RestTemplate();
         SaveMzFeeResponse hrgResponse = restTemplate.postForObject(hrgApiUrl + "/savePrescription", book, SaveMzFeeResponse.class);
         log.info("自助开单：{}，结果：{}", param, hrgResponse);

src/main/java/thyyxxk/wxservice_server/service/OrderCovidExamService.java

@@ -40,24 +40,17 @@ public class OrderCovidExamService {
     }
 
     public ResultVo<String> savePrescription(String patientId) {
-        String socialNo = dao.selectSocialNo(patientId);
-        if (!IdCardUtil.isValidatedIdCard(socialNo)) {
-            log.info("不合法的身份证：{}", socialNo);
-            return ResultVoUtil.fail(ExceptionEnum.SLIGHTLY_ERROR, "您在我院绑定的身份证号不是有效的身份证号，请重新填写。");
-        }
-        OrderCovidExamParam param = new OrderCovidExamParam();
-        param.setPatientId(patientId);
-        param.initMzYjReqList();
         RestTemplate restTemplate = new RestTemplate();
-        SaveMzFeeResponse hrgResponse = restTemplate.postForObject(hrgApiUrl + "/savePrescription", param, SaveMzFeeResponse.class);
+        String url = hrgApiUrl + "/nucleicAcidApplication?patientId=" + patientId;
+        SaveMzFeeResponse hrgResponse = restTemplate.getForObject(url, SaveMzFeeResponse.class);
         log.info("快速下单核酸检测：患者：{}，结果：{}", patientId, hrgResponse);
         if (null == hrgResponse) {
             return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
         }
-        if (-1 == hrgResponse.getResultCode()) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, hrgResponse.getResultMessage());
+        if (0 == hrgResponse.getResultCode()) {
+            return ResultVoUtil.success();
         }
-        return ResultVoUtil.success();
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, hrgResponse.getResultMessage());
     }
 
     public ResultVo<String> updateIdCard(String patientId, String socialNo) {