国际门诊挂号通知

src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -341,6 +341,11 @@ public class Constants {
      */
     public static final String EMERGENCY_WARD_CODE = "1070000";
 
+    /**
+     * 国际门诊科编码
+     */
+    public static final String GJMZ_CODE = "1060000";
+
     /**
      * 医学检验科编码
      */

src/main/java/cn/hnthyy/thmz/controller/mz/MzChargeDetailController.java

@@ -589,7 +589,7 @@ public class MzChargeDetailController {
                 }
             }
             if (oriMzChargeDetail.getAmount() != null) {
-                oriMzChargeDetail.setAmount(oriMzChargeDetail.getAmount().setScale(1, BigDecimal.ROUND_HALF_UP));
+                oriMzChargeDetail.setAmount(oriMzChargeDetail.getAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
             }
             BigDecimal oriAmount = BigDecimal.ZERO;
             if (oriMzChargeDetail != null) {
@@ -623,7 +623,7 @@ public class MzChargeDetailController {
             }
             MzChargeDetail returnMzChargeDetail = getMzChargeDetail(mzDepositFileVo.getPatientId(), mzChargeDetails.get(0).getTimes(), mzChargeDetails);
             returnMzChargeDetail.setOriAmount(oriAmount);
-            returnMzChargeDetail.setRefundFee(oriAmount.subtract(returnMzChargeDetail.getAmount()).setScale(1, BigDecimal.ROUND_HALF_UP));
+            returnMzChargeDetail.setRefundFee(oriAmount.subtract(returnMzChargeDetail.getAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             List<MzChargeDetail> realMzChargeDetails = Arrays.asList(returnMzChargeDetail);
             pageViewVo.setTotal(realMzChargeDetails.size());
             mzChargeDetailService.formatMzChargeDetail(realMzChargeDetails);

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -2700,7 +2700,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             throw new MzException(payInfo.getErrorMessage());
         }
         if (payInfo.getFundPay() == null || payInfo.getFundPay().compareTo(BigDecimal.ZERO) <= 0) {
-            throw new MzException("门诊统筹金额为空，无需进行补录操作！");
+            payInfo.setFundPay(BigDecimal.ZERO);
         }
         BigDecimal totalAmount = mzChargeDetailMapper.selectSumAmount(patientId, times, receiptNo);
         if (totalAmount == null) {

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -119,8 +119,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
     private MzVisitTableService mzVisitTableService;
     @Autowired
     private MzPatientMiService mzPatientMiService;
-//    @Autowired
-//    private HaiCiAdapterService haiCiAdapterService;
+    @Autowired
+    private HaiCiAdapterService haiCiAdapterService;
 
     //无需新冠调查的科室
     private List notCovid = Arrays.asList("1040200", "1040000", "1040100", "1070000", "1260000");
@@ -288,6 +288,10 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             //发送预约挂号未缴费的信息，推送缴费链接
             orderStatusChangeService.orderStatusChange(mzyReqrec.getPatientId() + "_" + times + "," + OrderStatusEnum.REGISTRATION_UN_PAY.code);
         }
+        //挂国际门诊1060000,调通知接口
+        if(Constants.GJMZ_CODE.equals(mzyReqrec.getUnitCode())){
+            haiCiAdapterService.notify(String.valueOf(serialNo),99);
+        }
         return 1;
     }