yeguodong 1 month ago
parent
commit
bc013ec799

+ 4 - 1
src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -2713,7 +2713,10 @@ public class MzChargeDetailController {
                 return resultMap;
             }
             Clinic clinic = clinicService.queryByPatientIdAndTimesAndReceiptNo(mzPrescriptionVo.getPatientId(), mzPrescriptionVo.getTimes(), 0);
-            PayInfo payInfo = tsmzService.directRegistration(tokenUser.getUserIdCode(), mzPrescriptionVo.getPatientId(), mzPrescriptionVo.getTimes(), mzPrescriptionVo.getReadCardResult(), mzPrescriptionVo.getGrzhzf(), mzPrescriptionVo.getReadCardType(), clinic == null ? null : clinic.getExpContent(),"11",null,null);
+            PayInfo payInfo = tsmzService.directRegistration(tokenUser.getUserIdCode(), mzPrescriptionVo.getPatientId(),
+                    mzPrescriptionVo.getTimes(), mzPrescriptionVo.getReadCardResult(), mzPrescriptionVo.getGrzhzf(),
+                    mzPrescriptionVo.getReadCardType(), clinic == null ? null : clinic.getExpContent(),
+                    "11",null,null, mzPrescriptionVo.getBusCardInfo());
             if (payInfo == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "职工门诊统筹试算失败,没有获取到结算信息");

+ 4 - 1
src/main/java/cn/hnthyy/thmz/service/impl/thmz/TsmzServiceImpl.java

@@ -387,7 +387,9 @@ public class TsmzServiceImpl implements TsmzService {
     }
 
     @Override
-    public PayInfo directRegistration(String staffId, String patientId, Integer times, String readCardResult, Integer acctUsedFlag, String readCardType, String expContent,String medType,String opspDisecode,String opspDiseName) {
+    public PayInfo directRegistration(String staffId, String patientId, Integer times, String readCardResult,
+                                      Integer acctUsedFlag, String readCardType, String expContent,String medType,
+                                      String opspDisecode,String opspDiseName, String busCardInfo) {
         log.info("调用职工门诊统筹试算接口,操作人={},病人={},就诊次数={},读卡类型={},读卡返回参数={}", staffId, patientId, times,readCardType,readCardResult);
         String realUrl = tsmzServiceUrl + "/directRegistration";
         Map<String, Object> map = new HashMap<>();
@@ -398,6 +400,7 @@ public class TsmzServiceImpl implements TsmzService {
         map.put("readCardType", readCardType);
         map.put("acctUsedFlag", acctUsedFlag == null ? 0 : acctUsedFlag);
         map.put("readCardResult", readCardResult);
+        map.put("busCardInfo", busCardInfo);
         map.put("medType", medType);
         map.put("opspDisecode", opspDisecode);
         map.put("opspDiseName", opspDiseName);

+ 3 - 1
src/main/java/cn/hnthyy/thmz/service/thmz/TsmzService.java

@@ -109,7 +109,9 @@ public interface TsmzService {
      * @param expContent 门诊统筹额外内容
      * @return
      */
-    PayInfo directRegistration(String staffId, String patientId, Integer times,String readCardResult,Integer acctUsedFlag,String readCardType, String expContent,String medType,String opspDisecode,String opspDiseName);
+    PayInfo directRegistration(String staffId, String patientId, Integer times,String readCardResult,
+                               Integer acctUsedFlag,String readCardType, String expContent,String medType,
+                               String opspDisecode,String opspDiseName, String pBusiCardInfo);
     /**
      * @description:  电子处方患者进行医保登记
      * @author: lihong

+ 1 - 0
src/main/java/cn/hnthyy/thmz/vo/MzPrescriptionVo.java

@@ -75,5 +75,6 @@ public class MzPrescriptionVo {
     //门诊统筹额外内容
     private String expContent;
 
+    private String busCardInfo;
 
 }

+ 1 - 1
src/main/resources/static/js/mz/toll_administration.js

@@ -3438,7 +3438,7 @@ function directRegistration(patientId, times) {
             patientId: patientId,
             times: times,
             readCardResult: $("#readCardResult").val(),
-            pBusiCardInfo: $("#pBusiCardInfo").val(),
+            busCardInfo: $("#pBusiCardInfo").val(),
             grzhzf: $("#grzhzf").val(),
             readCardType: $("#mztczfSiReadCardType").val()
         }),