添加黄码免费核酸检测。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>wxservice-server</artifactId>
-    <version>8.6</version>
+    <version>8.7</version>
     <name>wxservice-server</name>
     <description>server for wxservice-web</description>
 

src/main/java/thyyxxk/wxservice_server/controller/OrderCovidController.java

@@ -34,6 +34,11 @@ public class OrderCovidController {
         return service.getMultipleExamTimeLimit();
     }
 
+    @GetMapping("/yellowHealthCardFreeCovidExam")
+    public ResultVo<String> yellowHealthCardFreeCovidExam(@RequestParam("patientId") String patientId) {
+        return service.yellowHealthCardFreeCovidExam(patientId);
+    }
+
     @GetMapping("/timeLimitChanged")
     public String timeLimitChanged() {
         return service.timeLimitChanged();

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

@@ -83,10 +83,10 @@ public class OrderCovidExamService {
     }
 
     public String timeLimitChanged() {
-        log.info("重新获取混检开放时间。");
         String url = hrgApiUrl + "/getHyBirdTime";
         RestTemplate template = new RestTemplate();
         Map<String, Object> result = template.getForObject(url, HashMap.class);
+        log.info("重新获取混检开放时间：{}", result);
         if (null == result) {
             String msg = "获取混检开放时间失败，接口返回空。";
             log.info(msg);
@@ -97,17 +97,27 @@ public class OrderCovidExamService {
             log.info("获取混检开放时间失败：{}", msg);
             return msg;
         }
-
         Map<String, String> data = CastUtil.cast(result.get("data"));
         String value = data.get("configValue");
         String[] valuesArr = value.replaceAll(":", "").split("-");
-
         timeLimit.setLimitValue(value);
         timeLimit.setLimitValueForDisplay(value.replace("-", " - "));
         timeLimit.setBeginLimit(Integer.parseInt(valuesArr[0]));
         timeLimit.setEndLimit(Integer.parseInt(valuesArr[1]));
-
         return JSONObject.toJSONString(timeLimit);
     }
 
+    public ResultVo<String> yellowHealthCardFreeCovidExam(String patientId) {
+        RestTemplate restTemplate = new RestTemplate();
+        String url = hrgApiUrl + "/nucleicOnlyYellowAcidApplication?patientId=" + patientId;
+        SaveMzFeeResponse hrgResponse = restTemplate.getForObject(url, SaveMzFeeResponse.class);
+        log.info("黄码免费核酸检测快速下单：患者：{}，结果：{}", patientId, hrgResponse);
+        if (null == hrgResponse) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络异常，请稍后再试。");
+        }
+        if (0 == hrgResponse.getResultCode()) {
+            return ResultVoUtil.success("黄码免费核酸检测下单成功。");
+        }
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, hrgResponse.getResultMessage());
+    }
 }

src/main/resources/application.yml

@@ -32,8 +32,8 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
 
-#hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
-hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
+hrgApiUrl: http://172.16.30.33:8089/thmz/api/v1
+#hrgApiUrl: http://172.16.32.160:81/thmz/api/v1
 
 inspectionUrl: http://172.16.32.178:622/pushservice.asmx?wsdl
 physicalCheck: http://172.16.32.183:8888/bdp/dataservice/api/