黄码免费的项目允许退费

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

@@ -1420,8 +1420,8 @@ public class MedicalViewApiController {
         } catch (Exception e) {
             e.printStackTrace();
             resultMap.put("resultCode", -1);
-            resultMap.put("resultMessage", "保存住院收费出错，请联系管理员");
-            log.error("保存住院收费异常，错误信息{}", e);
+            resultMap.put("resultMessage", "保存住院收费出错,错误信息【"+e.getMessage()+"】，请联系管理员");
+            log.error("保存住院收费异常，错误信息{}", e.getMessage());
             return resultMap;
         }
     }

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

@@ -212,6 +212,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                             mzChargeDetail.setPrintFlag("-" + YesNoEnum.YES.code.toString());
                         }
                     }
+                }else {
+                    //没有发票需要打印
+                    mzChargeDetail.setPrintFlag("-" + YesNoEnum.YES.code.toString());
                 }
                 mzChargeDetail.setCountYbZf(mzPatientMiMapper.countYbZf(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes()));
             }
@@ -3164,8 +3167,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         int oriTimes = mzDepositFileVo.getTimes();
         if (allRefund) {
             getDeposFiles(opId, mzDepositFileVo, now, 0, 0, null, null, fullNewMzDepositFiles, allRefund, null);
-            //新增收费方式记录  退费的负数冲抵部分
-            mzDepositFileMapper.batchInsertMzDepositFile(fullNewMzDepositFiles);
+           if(fullNewMzDepositFiles.size()>0){
+               //新增收费方式记录  退费的负数冲抵部分
+               mzDepositFileMapper.batchInsertMzDepositFile(fullNewMzDepositFiles);
+           }
             times = 0;
             if (count > 0) {
                 //PayInfo result=

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

@@ -55,7 +55,10 @@ public class ZyDepositFileServiceImpl implements ZyDepositFileService {
             throw new MzException("住院号没有查询到对应的住院记录");
         }
         zyDepositFile.setAdmissTimes(Double.valueOf(zyActpatient.getAdmissTimes()));
-        int depoTimes = zyDepositFileMapper.selectMaxDepoTimes(zyDepositFile);
+        Integer depoTimes = zyDepositFileMapper.selectMaxDepoTimes(zyDepositFile);
+        if(depoTimes==null){
+            depoTimes=0;
+        }
         depoTimes++;
         zyDepositFile.setDepoTimes(Double.valueOf(depoTimes));
         zyDepositFile.setDepoDate(new Date());
@@ -66,6 +69,9 @@ public class ZyDepositFileServiceImpl implements ZyDepositFileService {
             Integer currentLedgerSn = zyLedgerFileMapper.selectCurrentLedgerSn(zyDepositFile.getInpatientNo(), zyActpatient.getAdmissTimes());
             if (currentLedgerSn == null) {
                 Integer maxLedgerSn = zyLedgerFileMapper.selectMaxLedgerSn(zyDepositFile.getInpatientNo(), zyActpatient.getAdmissTimes());
+                if(maxLedgerSn==null){
+                    maxLedgerSn=0;
+                }
                 currentLedgerSn = maxLedgerSn++;
             }
             zyDepositFile.setLedgerSn(Double.valueOf(currentLedgerSn));