优化门诊手术功能

src/main/java/cn/hnthyy/thmz/entity/his/zd/JcZdItem.java

@@ -4,6 +4,7 @@ import cn.hnthyy.thmz.pageDto.PageBean;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 检查字典
@@ -39,4 +40,6 @@ public class JcZdItem extends PageBean implements Serializable {
     private String bwCode;
     //组编码
     private String groupCode;
+    //执行地址
+    private BigDecimal execAddress;
 }

src/main/java/cn/hnthyy/thmz/entity/his/zd/JyZdItem.java

@@ -58,5 +58,6 @@ public class JyZdItem extends PageBean implements Serializable {
     private Integer type;
     //部位编码
     private String bwCode;
-
+    //执行地址
+    private BigDecimal execAddress;
 }

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

@@ -1694,8 +1694,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 opDetail.put("opCode", opRecord.getOpCode());
                 opDetail.put("opName", opRecord.getOpName());
                 opDetail.put("opDatetime", opRecord.getOpDatetimeStr());
-                opDetail.put("urgentClinicFlag", YesNoEnum.YES.code.equals(opRecord.getUrgentClinicFlag())?YesNoEnum.YES.name:YesNoEnum.NO.name);
-                opDetail.put("ssbc", YesNoEnum.YES.code.equals(opRecord.getSstc())?"正常":"加班");
+                opDetail.put("urgentClinicFlag", YesNoEnum.YES.code.toString().equals(opRecord.getUrgentClinicFlag())?YesNoEnum.YES.name:YesNoEnum.NO.name);
+                opDetail.put("ssbc", YesNoEnum.YES.code.toString().equals(opRecord.getSsbc())?"正常":"加班");
                 OpZdPartNew opZdPartNew=opRecordMapper.selectOpZdPartNewByCode(opRecord.getPartCode());
                 if(opZdPartNew!=null){
                     opDetail.put("partName", opZdPartNew.getName());

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

@@ -3318,6 +3318,7 @@ function editPrescription(jsonData, type) {
             $('#hocusCode').selectpicker('refresh');
             $('#doctorZd').selectpicker('val',opRecord.doctorZd);
             $('#doctorZd').selectpicker('refresh');
+            $("#opRecordRemark").val(opRecord.remark);
             saveOpRecord(false);
         }
         $("#op_record_button").click();