检查单说明优化

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

@@ -1012,7 +1012,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             MzReceiptSerial ylkMzReceiptSerial = CloneUtil.clone(mzReceiptSerial);
             ylkMzReceiptSerial.setTotalCharge(receiptSerialFee.getYlkje());
             ylkMzReceiptSerial.setChequeType(Constants.YLK);
-            if (haveOtherPay) {
+            if (haveOtherPay || (receiptSerialFee.getJhzfje() != null && receiptSerialFee.getJhzfje().compareTo(BigDecimal.ZERO) == 1)) {
                 ylkMzReceiptSerial.resetParams();
             }
             mzReceiptSerialMapper.insertMzReceiptSerial(ylkMzReceiptSerial);
@@ -3584,9 +3584,13 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (PayMarkEnum.CHARGED.code.equals(payMark)) {
             MzYjReq mzYjReq = new MzYjReq(patientId, times);
             mzYjReq.setPayMark(PayMarkEnum.CHARGED.code);
-            mzPrescriptionVo.setMzYjReqList(mzYjReqMapper.selectMzYjReqByTimesAndPayMark(mzYjReq));
+            List<MzYjReq> mzYjReqs = mzYjReqMapper.selectMzYjReqByTimesAndPayMark(mzYjReq);
+            setComent8(mzYjReqs);
+            mzPrescriptionVo.setMzYjReqList(mzYjReqs);
         } else if (PayMarkEnum.NO_CHARGE.code.equals(payMark)) {
-            mzPrescriptionVo.setMzYjReqList(mzYjReqMapper.selectNotPayMzYjReq(new MzYjReq(patientId, times)));
+            List<MzYjReq> mzYjReqs = mzYjReqMapper.selectNotPayMzYjReq(new MzYjReq(patientId, times));
+            setComent8(mzYjReqs);
+            mzPrescriptionVo.setMzYjReqList(mzYjReqs);
         }
         if (mzBlRecord.getPrescriptionDetail() == null || StringUtils.isBlank(mzBlRecord.getPrescriptionDetail())) {
             MzPatientMi mzPatientMi = mzPatientMiMapper.selectByPatientId(mzPrescriptionVo.getPatientId());
@@ -3751,15 +3755,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             return null;
         }
         if(NumberEnum.ThREE.getCode().equals(reqType)){
-            for(MzYjReq mzYjReq: mzYjReqList){
-                JcZdItem jcZdItem = jcZdItemMapper.selectJcZdItemByCode(mzYjReq.getOrderCode());
-                if(jcZdItem !=null && StrUtil.isNotBlank(jcZdItem.getClassCode())){
-                    JcZdClass jcZdClass = jcZdClassMapper.selectJcZdClassByCode(jcZdItem.getClassCode());
-                    if(jcZdClass !=null && StrUtil.isNotBlank(jcZdClass.getComment8())){
-                        mzYjReq.setComment8(jcZdClass.getComment8());
-                    }
-                }
-            }
+            setComent8(mzYjReqList);
         }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("mzYjReqList", mzYjReqList);
@@ -3797,6 +3793,20 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         return resultMap;
     }
 
+   private void setComent8(List<MzYjReq> mzYjReqList) {
+        for(MzYjReq mzYjReq: mzYjReqList){
+            if(NumberEnum.ThREE.getCode().equals(mzYjReq.getReqType())){
+                JcZdItem jcZdItem = jcZdItemMapper.selectJcZdItemByCode(mzYjReq.getOrderCode());
+                if(jcZdItem !=null && StrUtil.isNotBlank(jcZdItem.getClassCode())){
+                    JcZdClass jcZdClass = jcZdClassMapper.selectJcZdClassByCode(jcZdItem.getClassCode());
+                    if(jcZdClass !=null && StrUtil.isNotBlank(jcZdClass.getComment8())){
+                        mzYjReq.setComment8(jcZdClass.getComment8());
+                    }
+                }
+            }
+        }
+    }
+
 //    @Override
 //    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT, timeout = 36000, rollbackFor = Exception.class)
 //    public int reSaveDetailFromBak(MzChargeDetail mzChargeDetail) {

src/main/resources/static/js/mz/clinic.js

@@ -11169,6 +11169,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                             $("#reqNoJcReq").text(mzYjReq.reqNo);
                             $("#jcReqItem").text(mzYjReq.groupName);
                             $("#jcReqRemark").text(mzYjReq.jyRemark);
+                            $("#jcComment8").text(mzYjReq.comment8);
                             LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jc_card_table").innerHTML);
                             index++;
                         }