挂号发票优化

src/main/java/cn/hnthyy/thmz/controller/ChargeFeeVoController.java

@@ -390,7 +390,7 @@ public class ChargeFeeVoController {
             Integer ghfps=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.NO.code.toString(), null, null, null);
             Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(tokenUser.getUserIdCode(), YesNoEnum.YES.code.toString(), null, null, null);
             //收费发票总数
-            Integer fpCount=sffps+tpzs+zffps+ghfps+ghtpzs-notFpList.size();
+            Integer fpCount=sffps+tpzs+zffps+ghfps+ghtpzs;
             resultMap.put("sffps",fpCount>=0?fpCount:0);
             //退费发票张数
             resultMap.put("tpzs", tpzs+ghtpzs);
@@ -496,7 +496,7 @@ public class ChargeFeeVoController {
             //退号发票张数
             Integer ghtpzs=chargeFeeVoService.countReqrecReceipt(chargeFeeParamsVo.getOpId(), YesNoEnum.YES.code.toString(), chargeFeeParamsVo.getDcountDate(), null, null);
             //收费发票总数
-            Integer fpCount=sffps+tpzs+zffps+ghfps+ghtpzs-notFpList.size();
+            Integer fpCount=sffps+tpzs+zffps+ghfps+ghtpzs;
             resultMap.put("sffps",fpCount>=0?fpCount:0);
             //退费发票张数
             resultMap.put("tpzs", tpzs+ghtpzs);

src/main/java/cn/hnthyy/thmz/controller/MzyReqrecController.java

@@ -576,7 +576,7 @@ public class MzyReqrecController {
             }
             BigDecimal totalFee = mzyReqrec.getReqFee().add(mzyReqrec.getClinicFee()).add(mzyReqrec.getOthFee()).add(mzyReqrec.getBrochureFee());
             if(totalFee.compareTo(BigDecimal.ZERO)==0){
-                resultMap.put("code", -2);
+                resultMap.put("code", -1);
                 resultMap.put("message", "当前病人无费用信息，无需开具发票");
                 return resultMap;
             }

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

@@ -220,7 +220,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,timeout=36000,rollbackFor=Exception.class)
     public int printMzyReqrecRecept(MzyReqrec mzyReqrec) throws MzException {
         //有时候发票打印失败，需要补打，补打不增加发票号码
-        boolean isReprint = StringUtils.isNotBlank(mzyReqrec.getReceiptBill());
+        boolean isReprint = StringUtils.isNotBlank(mzyReqrec.getReceiptBill()) && mzyReqrec.getReceiptBill().trim().length()==8;
         MzyReqrec newMzyReqrec = new MzyReqrec();
         newMzyReqrec.setPatientId(mzyReqrec.getPatientId());
         newMzyReqrec.setTimes(mzyReqrec.getTimes());