本院记账收费优化

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

@@ -381,12 +381,7 @@ public class MzChargeDetailController {
             tempDepositFile.setPayMark(PayMarkEnum.CHARGED.code);
             tempDepositFile.setReceiptNo(1);
             List<MzDepositFile> mzDepositFiles = mzDepositFileService.queryMzDepositFileByTimesAndPayMark(tempDepositFile);
-            if(CollUtil.isNotEmpty(mzDepositFiles)){
-            //    修改收费人
-                mzChargeDetailService.updateOpId(HttpUtil.getIPAddress(httpServletRequest),TokenUtil.getUser().getUserIdCode(),mzDepositFileVo);
-                resultMap.put("receiptNo", 1);
-            }
-           else if (mzReceiptSerials != null && mzReceiptSerials.size() > 0) {
+            if (mzReceiptSerials != null && mzReceiptSerials.size() > 0) {
                 //本院记账退费重收操作
 //                for (MzDepositFile m : mzDepositFileVo.getMzDepositFiles()) {
 //                    if (Constants.BYJZ.equals(m.getChequeType())) {
@@ -397,7 +392,13 @@ public class MzChargeDetailController {
 //                }
                 int receiptNo = mzChargeDetailService.chargeFeeForByjz(tokenUser.getUserIdCode(), mzDepositFileVo);
                 resultMap.put("receiptNo", receiptNo);
-            } else {
+            }
+             else  if(CollUtil.isNotEmpty(mzDepositFiles)){
+                //    修改收费人
+                mzChargeDetailService.updateOpId(HttpUtil.getIPAddress(httpServletRequest),TokenUtil.getUser().getUserIdCode(),mzDepositFileVo);
+                resultMap.put("receiptNo", 1);
+            }
+            else {
                 String ipAddress = HttpUtil.getIPAddress(httpServletRequest);
                 int receiptNo = mzChargeDetailService.chargeFee(tokenUser.getUserIdCode(), mzDepositFileVo, ipAddress);
                 resultMap.put("receiptNo", receiptNo);

src/main/resources/static/js/zy/hospitalized.js

@@ -478,8 +478,9 @@ function queryMzPatientInfo(keyWard) {
             if(res.code == 0 && res.data != null){
                 if( res.data.length > 1 ){
                     fitPatient(res)
-                }else {
+                }else if(res.data.length == 1) {
                     fillPatinet(res.data[0].patientId)
+                    queryMzZyReq(res.data[0].patientId)
                 }
             }
         }