住院预缴金需要传缴费流水号

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -1192,6 +1192,11 @@ public class MedicalViewApiController {
                 resultMap.put("resultMessage", "缴费金额不能为空");
                 return resultMap;
             }
+            if (StringUtils.isBlank(zyDepositFile.getReceiptNo())) {
+                resultMap.put("resultCode", -1);
+                resultMap.put("resultMessage", "缴费流水号不能为空");
+                return resultMap;
+            }
             zyDepositFile.setOpIdCode(Constants.BRZZJF_CODE);
             zyDepositFileService.saveZyDepositFile(zyDepositFile);
             resultMap.put("resultCode", 0);

src/main/java/cn/hnthyy/thmz/service/impl/his/zy/ZyDepositFileServiceImpl.java

@@ -3,6 +3,7 @@ package cn.hnthyy.thmz.service.impl.his.zy;
 import cn.hnthyy.thmz.Utils.CloneUtil;
 import cn.hnthyy.thmz.Utils.DateUtil;
 import cn.hnthyy.thmz.Utils.Md5Util;
+import cn.hnthyy.thmz.common.Constants;
 import cn.hnthyy.thmz.entity.MzException;
 import cn.hnthyy.thmz.entity.his.zy.ZyActpatient;
 import cn.hnthyy.thmz.entity.his.zy.ZyDepositFile;
@@ -76,7 +77,10 @@ public class ZyDepositFileServiceImpl implements ZyDepositFileService {
         }
         //缴费
         if (ZyDepositFileStatusEnum.PREPAY.code.equals(zyDepositFile.getStatus())) {
-            zyDepositFile.setReceiptNo(Md5Util.getReceiptNo());
+            //非自助的需要传缴费流水号
+            if(!(Constants.ZZWX.equals(zyDepositFile.getDepoType())||Constants.ZZZFB.equals(zyDepositFile.getDepoType()))){
+                zyDepositFile.setReceiptNo(Md5Util.getReceiptNo());
+            }
             zyDepositFile.setPrinted(Double.valueOf(0));
         } else if (ZyDepositFileStatusEnum.STRAIGHT_BACK.code.equals(zyDepositFile.getStatus())) {
             //退费