检查申请单说明

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzYjReq.java

@@ -103,6 +103,8 @@ public class MzYjReq extends PageBean {
     private String execName;
     //检验物名称
     private String inspectName;
+    //注意事项
+    private String comment8;
 
     public MzYjReq() {
     }

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

@@ -24,6 +24,7 @@ import cn.hnthyy.thmz.enums.*;
 import cn.hnthyy.thmz.mapper.his.mz.*;
 import cn.hnthyy.thmz.mapper.his.yp.YpBaseYfMapper;
 import cn.hnthyy.thmz.mapper.his.yp.YpMzFytjMapper;
+import cn.hnthyy.thmz.mapper.his.zd.JcZdClassMapper;
 import cn.hnthyy.thmz.mapper.his.zd.JcZdItemMapper;
 import cn.hnthyy.thmz.mapper.his.zd.MzZdYpYshMapper;
 import cn.hnthyy.thmz.mapper.his.zd.OpRecordMapper;
@@ -213,6 +214,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     private DictDataService dictDataService;
     @Resource
     private MzOrderDetailService mzOrderDetailService;
+    @Resource
+    private JcZdClassMapper jcZdClassMapper;
     //是否加收开关
     @Value("${setUnitPrice}")
     private boolean setUnitPrice;
@@ -3747,6 +3750,17 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         if (mzYjReqList == null || mzYjReqList.size() == 0) {
             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());
+                    }
+                }
+            }
+        }
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("mzYjReqList", mzYjReqList);
         MzYjReq mzYjReq = mzYjReqList.get(0);

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

@@ -11542,6 +11542,7 @@ function printYjReq(patientId, times, type, printType) {
                         $("#reqNoJcReq").text(obj.reqNo);
                         $("#jcReqItem").text(obj.groupName);
                         $("#jcReqRemark").text(obj.jyRemark);
+                        $("#jcComment8").text(obj.comment8);
                         LODOP.ADD_PRINT_HTM("0mm", "5mm", "140mm", "200mm", strStyle + document.getElementById("jc_card_table").innerHTML);
                         needNewPageA = true;
                     } else if (obj.reqType == "2") {

src/main/resources/templates/mz/clinic.html

@@ -2823,6 +2823,13 @@
                     <td colspan="7" id="jcReqRemark"
                         style="border:solid black; border-width:0px 1px 1px 0px; padding-left:10px;"></td>
                 </tr>
+                <tr>
+                    <td style="border:solid black; border-width:0px 1px 1px 0px; padding-left:10px;min-height: 50px;">
+                        说明
+                    </td>
+                    <td colspan="7" id="jcComment8"
+                        style="border:solid black; border-width:0px 1px 1px 0px; padding-left:10px;"></td>
+                </tr>
                 </tbody>
             </table>
             <table class="table table-striped table-bordered"