修复单病种收费。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>6.8</version>
+    <version>6.9</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
 

src/main/java/thyyxxk/webserver/service/makedbzfees/MakeDbzFeesService.java

@@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
-import thyyxxk.webserver.constants.HrgAddr;
+import thyyxxk.webserver.constants.ExternalAddr;
 import thyyxxk.webserver.dao.his.makedbzfees.MakeDbzFeesDao;
 import thyyxxk.webserver.entity.HrgResponse;
 import thyyxxk.webserver.entity.ResultVo;
@@ -45,7 +45,7 @@ public class MakeDbzFeesService {
         obj.put("patCardNo", patientId);
         obj.put("hisOrdNum", null);
         RestTemplate template = new RestTemplate();
-        HrgResponse hrgRes = template.postForObject(HrgAddr.GET_MZ_CHARGE_DETAIL_FOR_UN_PAID, obj, HrgResponse.class);
+        HrgResponse hrgRes = template.postForObject(ExternalAddr.GET_MZ_CHARGE_DETAIL_FOR_UN_PAID, obj, HrgResponse.class);
         if (null == hrgRes || null == hrgRes.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
         }
@@ -63,7 +63,7 @@ public class MakeDbzFeesService {
             p.put("patientId", str[0]);
             p.put("times", str[1]);
             p.put("receiptNo", str[2]);
-            HrgResponse hrgResponse = template.postForObject(HrgAddr.UN_PAID_TO_FULL_CHARGE_DETAIL, p, HrgResponse.class);
+            HrgResponse hrgResponse = template.postForObject(ExternalAddr.UN_PAID_TO_FULL_CHARGE_DETAIL, p, HrgResponse.class);
             if (null == hrgResponse || null == hrgResponse.getResultCode()) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");
             }
@@ -122,16 +122,11 @@ public class MakeDbzFeesService {
         }
         batchIntoZyDetailCharge(zyFees, inpatientInfo);
         JSONObject pay = new JSONObject();
-        pay.put("patCardType", 1);
-        pay.put("patCardNo", param.getHisOrdNum().split("_")[0]);
-        pay.put("hisOrdNum", param.getHisOrdNum());
-        pay.put("psOrdNum", "dbz" + SnowFlakeId.instance().nextId());
-        pay.put("payMode", "WX");
-        pay.put("payAmt", param.getTotalAmt());
-        pay.put("agtOrdNum", SnowFlakeId.instance().nextId());
-        pay.put("payTime", DateUtil.formatDatetime(new Date()));
+        pay.put("patientId", param.getHisOrdNum().split("_")[0]);
+        pay.put("times", param.getHisOrdNum().split("_")[1]);
+        pay.put("receiptNo", param.getHisOrdNum().split("_")[2]);
         RestTemplate restTemplate = new RestTemplate();
-        HrgResponse hrgResponse = restTemplate.postForObject(HrgAddr.PAY_CHARGE_DETAIL_FORM_HAI_CI, pay, HrgResponse.class);
+        HrgResponse hrgResponse = restTemplate.postForObject(ExternalAddr.PAY_CHARGE_DETAIL_FORM_DBZSF, pay, HrgResponse.class);
         log.info("保存单病种缴费：{}", hrgResponse);
         if (null == hrgResponse || null == hrgResponse.getResultCode()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "网络服务错误！");