Browse Source

增加辅助资料

lihong 1 năm trước cách đây
mục cha
commit
4b7d7cd070

+ 1 - 0
src/main/java/cn/hnthyy/thmz/controller/mz/MzBlRecordController.java

@@ -263,6 +263,7 @@ public class MzBlRecordController {
             dbMzBlRecord.setFamilyHistory(mzBlRecord.getFamilyHistory());
             dbMzBlRecord.setObstericalHistory(mzBlRecord.getObstericalHistory());
             dbMzBlRecord.setEmrPe(mzBlRecord.getEmrPe());
+            dbMzBlRecord.setFzZl(mzBlRecord.getFzZl());
             dbMzBlRecord.setWeight(mzBlRecord.getWeight());
             dbMzBlRecord.setTemperature(mzBlRecord.getTemperature());
             dbMzBlRecord.setSphygmus(mzBlRecord.getSphygmus());

+ 1 - 0
src/main/java/cn/hnthyy/thmz/controller/mz/WorkspaceConfigController.java

@@ -123,6 +123,7 @@ public class WorkspaceConfigController {
                 workspaceConfig.setTentativeDiagnosisFlag(YesNoEnum.YES.code);
                 workspaceConfig.setCheckboxFlag(YesNoEnum.YES.code);
                 workspaceConfig.setZlPrintFlag(YesNoEnum.NO.code);
+                workspaceConfig.setFzZlFlag(YesNoEnum.NO.code);
             }
             resultMap.put("code", 0);
             resultMap.put("message", "查询当前医生的工作台配置成功");

+ 5 - 0
src/main/java/cn/hnthyy/thmz/entity/his/mz/MzBlRecord.java

@@ -69,6 +69,8 @@ public class MzBlRecord extends PageBean {
 
     //个人史
     private String personalHistory;
+    //辅助资料
+    private String fzZl;
     //家族史
     private String familyHistory;
     //婚育史
@@ -179,6 +181,9 @@ public class MzBlRecord extends PageBean {
         if (mzBlRecord.getFamilyHistory() == null) {
             mzBlRecord.setFamilyHistory("");
         }
+        if (mzBlRecord.getFzZl() == null) {
+            mzBlRecord.setFzZl("");
+        }
         if (mzBlRecord.getObstericalHistory() == null) {
             mzBlRecord.setObstericalHistory("");
         }

+ 4 - 0
src/main/java/cn/hnthyy/thmz/entity/thmz/WorkspaceConfig.java

@@ -49,6 +49,10 @@ public class WorkspaceConfig  implements Serializable {
 	 * 家族史 是否展示  0 展示 1 不展示
 	 */
 	private Integer familyHistoryFlag;
+	/**
+	 * 辅助资料 是否展示  0 展示 1 不展示
+	 */
+	private Integer fzZlFlag;
 
 	/**
 	 * 婚育史 是否展示  0 展示 1 不展示

+ 7 - 4
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzBlRecordMapper.java

@@ -12,12 +12,12 @@ import java.util.Map;
 public interface MzBlRecordMapper {
     @Insert("insert into mz_bl_record(patient_id,times,emr_no,emr_type,visit_date,doctor_code,dept_code,first_or_not,emr_chief_complaint,emr_hpi,emr_ps,emr_pe,emr_fzjc," +
             "emr_process,emr_xyy,emr_yypg,emr_gnpg,emr_jkjy,personal_history,family_history,obsterical_history,weight,temperature,sphygmus,breathe,pressure_high," +
-            "pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail) VALUES (#{patientId,jdbcType=CHAR}," +
+            "pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail,fz_zl) VALUES (#{patientId,jdbcType=CHAR}," +
             "#{times,jdbcType=INTEGER},#{emrNo,jdbcType=VARCHAR},#{emrType,jdbcType=CHAR},#{visitDate,jdbcType=TIMESTAMP},#{doctorCode,jdbcType=CHAR}," +
             "#{deptCode,jdbcType=VARCHAR},#{firstOrNot,jdbcType=CHAR},#{emrChiefComplaint,jdbcType=VARCHAR},#{emrHpi,jdbcType=VARCHAR},#{emrPs,jdbcType=VARCHAR}," +
             "#{emrPe,jdbcType=VARCHAR},#{emrFzjc,jdbcType=VARCHAR},#{emrProcess,jdbcType=VARCHAR},#{emrXyy,jdbcType=VARCHAR},#{emrYypg,jdbcType=VARCHAR}," +
             "#{emrGnpg,jdbcType=VARCHAR},#{emrJkjy,jdbcType=VARCHAR},#{personalHistory},#{familyHistory},#{obstericalHistory},#{weight},#{temperature},#{sphygmus}" +
-            ",#{breathe},#{pressureHigh},#{pressureFloor},#{pressureHighLeft},#{pressureFloorLeft},#{tentativeDiagnosis},#{prescriptionDetail})")
+            ",#{breathe},#{pressureHigh},#{pressureFloor},#{pressureHighLeft},#{pressureFloorLeft},#{tentativeDiagnosis},#{prescriptionDetail},#{fzZl})")
     int insertMzBlRecord(MzBlRecord mzBlRecord);
 
 
@@ -39,7 +39,7 @@ public interface MzBlRecordMapper {
      */
     @Select("select patient_id,times,emr_no,emr_type,visit_date,doctor_code,dept_code,first_or_not,emr_chief_complaint," +
             "emr_hpi,emr_ps,emr_pe,emr_fzjc,emr_process,emr_xyy,emr_yypg,emr_gnpg,emr_jkjy,personal_history,family_history," +
-            "obsterical_history,weight,temperature,sphygmus,breathe,pressure_high,pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail " +
+            "obsterical_history,weight,temperature,sphygmus,breathe,pressure_high,pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail,fz_zl " +
             " from mz_bl_record WITH(NOLOCK) where patient_id= #{patientId,jdbcType=VARCHAR} and times =#{times}")
     MzBlRecord selectMzBlRecordByPatientIdAndTimes(@Param("patientId") String patientId,@Param("times") Integer times);
 
@@ -121,7 +121,7 @@ public interface MzBlRecordMapper {
     @Select({"<script>",
             "select top ${pageSize} patient_id,times,emr_no,emr_type,visit_date,doctor_code,dept_code,first_or_not,emr_chief_complaint,",
             "emr_hpi,emr_ps,emr_pe,emr_fzjc,emr_process,emr_xyy,emr_yypg,emr_gnpg,emr_jkjy,personal_history,family_history," ,
-                    "obsterical_history,weight,temperature,sphygmus,breathe,pressure_high,pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail " ,
+                    "obsterical_history,weight,temperature,sphygmus,breathe,pressure_high,pressure_floor,pressure_high_left,pressure_floor_left,tentative_diagnosis,prescription_detail,fz_zl " ,
             " FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_bl_record_page.visit_date desc) AS RowNumber,",
             "* from dbo.mz_bl_record mz_bl_record_page WITH(NOLOCK) where 1=1 ",
             "<when test='patientIds!=null'>",
@@ -215,6 +215,9 @@ public interface MzBlRecordMapper {
             "<when test='pressureFloorLeft!=null'>",
             ",pressure_floor_left =#{pressureFloorLeft}",
             "</when>",
+            "<when test='fzZl!=null'>",
+            ",fz_zl =#{fzZl}",
+            "</when>",
             "</trim>"
             , "</script>"})
     int updateMzBlRecordEmrProcess(MzBlRecord mzBlRecord);

+ 7 - 4
src/main/java/cn/hnthyy/thmz/mapper/thmz/WorkspaceConfigMapper.java

@@ -10,8 +10,8 @@ public interface WorkspaceConfigMapper {
      * @return
      */
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
-    @Insert("insert into t_workspace_config(user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date) " +
-            "values(#{userIdCode},#{symptomFlag},#{emrHpiFlag},#{emrPsFlag},#{personalHistoryFlag},#{familyHistoryFlag},#{obstericalHistoryFlag},#{pressureLeftFlag},#{tentativeDiagnosisFlag},#{checkboxFlag},#{zlPrintFlag},#{createId},#{createDate},#{updateId},#{updateDate})")
+    @Insert("insert into t_workspace_config(user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date,fz_zl_flag) " +
+            "values(#{userIdCode},#{symptomFlag},#{emrHpiFlag},#{emrPsFlag},#{personalHistoryFlag},#{familyHistoryFlag},#{obstericalHistoryFlag},#{pressureLeftFlag},#{tentativeDiagnosisFlag},#{checkboxFlag},#{zlPrintFlag},#{createId},#{createDate},#{updateId},#{updateDate},#{fzZlFlag})")
     int insert(WorkspaceConfig workspaceConfig);
 
     /**
@@ -19,7 +19,7 @@ public interface WorkspaceConfigMapper {
      * @param id
      * @return
      */
-    @Select("select id,user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date from t_workspace_config where id = #{id}")
+    @Select("select id,user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date,fz_zl_flag from t_workspace_config where id = #{id}")
     WorkspaceConfig selectWorkspaceConfigById(@Param("id") Long id);
 
 
@@ -28,7 +28,7 @@ public interface WorkspaceConfigMapper {
      * @param userIdCode
      * @return
      */
-    @Select("select id,user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date from t_workspace_config where user_id_code = #{userIdCode}")
+    @Select("select id,user_id_code,symptom_flag,emr_hpi_flag,emr_ps_flag,personal_history_flag,family_history_flag,obsterical_history_flag,pressure_left_flag,tentative_diagnosis_flag,checkbox_flag,zl_print_flag,create_id,create_date,update_id,update_date,fz_zl_flag from t_workspace_config where user_id_code = #{userIdCode}")
     WorkspaceConfig selectWorkspaceConfigByUserIdCode(@Param("userIdCode") String userIdCode);
 
 
@@ -58,6 +58,9 @@ public interface WorkspaceConfigMapper {
             "<when test='obstericalHistoryFlag!=null'>",
             ",obsterical_history_flag =#{obstericalHistoryFlag}",
             "</when>",
+            "<when test='fzZlFlag!=null'>",
+            ",fz_zl_flag =#{fzZlFlag}",
+            "</when>",
             "<when test='pressureLeftFlag!=null'>",
             ",pressure_left_flag =#{pressureLeftFlag}",
             "</when>",

+ 4 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -3020,6 +3020,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzBlRecord.setEmrJkjy("无");
         mzBlRecord.setPersonalHistory("");
         mzBlRecord.setFamilyHistory("");
+        mzBlRecord.setFzZl("");
         mzBlRecord.setObstericalHistory("");
         mzBlRecord.setTentativeDiagnosis("");
         mzBlRecord.setPrescriptionDetail("");
@@ -3081,6 +3082,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzBlRecord.setEmrJkjy("无");
         mzBlRecord.setPersonalHistory("");
         mzBlRecord.setFamilyHistory("");
+        mzBlRecord.setFzZl("");
         mzBlRecord.setObstericalHistory("");
         mzBlRecord.setTentativeDiagnosis("");
         mzBlRecord.setPrescriptionDetail("");
@@ -3192,6 +3194,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mzBlRecord.setEmrJkjy("无");
             mzBlRecord.setPersonalHistory("");
             mzBlRecord.setFamilyHistory("");
+            mzBlRecord.setFzZl("");
             mzBlRecord.setObstericalHistory("");
             mzBlRecord.setTentativeDiagnosis("");
             mzBlRecord.setPrescriptionDetail("");
@@ -3265,6 +3268,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzBlRecord.setEmrJkjy("无");
         mzBlRecord.setPersonalHistory("");
         mzBlRecord.setFamilyHistory("");
+        mzBlRecord.setFzZl("");
         mzBlRecord.setObstericalHistory("");
         mzBlRecord.setTentativeDiagnosis("");
         mzBlRecord.setPrescriptionDetail("");

+ 29 - 1
src/main/resources/static/js/mz/clinic.js

@@ -360,7 +360,7 @@ $(function () {
             //     }
             //     console.log("eleId=" + eleId);
             // } else
-            if (id == 'symptom' || id == 'emrHpi' || id == 'emrPs' || id == 'personalHistory' || id == 'familyHistory' || id == 'obstericalHistory' || id == 'otherCheck' || id == 'diagnose' || id == 'tentativeDiagnosis') {
+            if (id == 'symptom' || id == 'emrHpi' || id == 'emrPs' || id == 'personalHistory' || id == 'familyHistory' || id == 'obstericalHistory' || id == 'otherCheck' || id == 'diagnose' || id == 'tentativeDiagnosis' || id == 'fzZl' ) {
                 console.log("1id=" + id);
                 if (id != $(customization[customization.length - 1]).attr("target-id")) {
                     var next = $("#" + id + "Flag").next();
@@ -2487,6 +2487,7 @@ function clearWorkSpaceExcludeUser(source) {
         $("#emrPs").val(null);
         $("#personalHistory").val(null);
         $("#familyHistory").val(null);
+        $("#fzZl").val(null);
         $("#obstericalHistory").val(null);
         $("#weight").val(null);
         $("#temperature").val(null);
@@ -3198,6 +3199,7 @@ function editPrescription(jsonData, type) {
         $("#emrPs").val(jsonData.mzBlRecord.emrPs);
         $("#personalHistory").val(jsonData.mzBlRecord.personalHistory);
         $("#familyHistory").val(jsonData.mzBlRecord.familyHistory);
+        $("#fzZl").val(jsonData.mzBlRecord.fzZl);
         $("#obstericalHistory").val(jsonData.mzBlRecord.obstericalHistory);
         if (jsonData.mzBlRecord.weight != null && jsonData.mzBlRecord.weight != 0) {
             $("#weight").val(jsonData.mzBlRecord.weight);
@@ -9038,6 +9040,19 @@ function initWorkspaceConfigForCurrent() {
                         $("#personalHistoryFlagCheck").parent().parent().click();//当前不选中改为选中
                     }
                 }
+
+                if (res.data.fzZlFlag == 1) {
+                    $("#fzZlFlag").removeClass("in").addClass("hide");
+                    if ($("#fzZlFlagCheck").parent().hasClass("checked")) {
+                        $("#fzZlFlagCheck").parent().parent().click();//当前选中改为不选中
+                    }
+                } else if (res.data.fzZlFlag == 0) {
+                    $("#fzZlFlag").removeClass("hide").addClass("in");
+                    if (!$("#fzZlFlagCheck").parent().hasClass("checked")) {
+                        $("#fzZlFlagCheck").parent().parent().click();//当前不选中改为选中
+                    }
+                }
+
                 if (res.data.familyHistoryFlag == 1) {
                     $("#familyHistoryFlag").removeClass("in").addClass("hide");
                     if ($("#familyHistoryFlagCheck").parent().hasClass("checked")) {
@@ -9119,6 +9134,7 @@ function saveWorkspaceConfig() {
     var emrPsFlag = $("#emrPsFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
     var personalHistoryFlag = $("#personalHistoryFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
     var familyHistoryFlag = $("#familyHistoryFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
+    var fzZlFlag = $("#fzZlFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
     var obstericalHistoryFlag = $("#obstericalHistoryFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
     var pressureLeftFlag = $("#pressureLeftFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
     var tentativeDiagnosisFlag = $("#tentativeDiagnosisFlagCheck").parent().hasClass("checked") == true ? 0 : 1;
@@ -9135,6 +9151,7 @@ function saveWorkspaceConfig() {
             "emrPsFlag": emrPsFlag,
             "personalHistoryFlag": personalHistoryFlag,
             "familyHistoryFlag": familyHistoryFlag,
+            "fzZlFlag": fzZlFlag,
             "obstericalHistoryFlag": obstericalHistoryFlag,
             "pressureLeftFlag": pressureLeftFlag,
             "tentativeDiagnosisFlag": tentativeDiagnosisFlag,
@@ -9305,6 +9322,7 @@ function getParamsForpPrescription(type) {
         '"emrJkjy": "",' +
         '"personalHistory": "",' +
         '"familyHistory": "",' +
+        '"fzZl": "",' +
         '"obstericalHistory": "",' +
         '"weight": "",' +
         '"temperature": "",' +
@@ -9374,6 +9392,7 @@ function getParamsForpPrescription(type) {
     jsonData.mzBlRecord.emrJkjy = $("#healthEducation").val();
     jsonData.mzBlRecord.personalHistory = $("#personalHistory").val();
     jsonData.mzBlRecord.familyHistory = $("#familyHistory").val();
+    jsonData.mzBlRecord.fzZl = $("#fzZl").val();
     jsonData.mzBlRecord.obstericalHistory = $("#obstericalHistory").val();
     jsonData.mzBlRecord.weight = $("#weight").val();
     jsonData.mzBlRecord.temperature = $("#temperature").val();
@@ -11642,6 +11661,12 @@ function printBlRecord(patientId, times, printType) {
                 } else {
                     $("#familyHistoryBlrecord").parent().css("display", "none");
                 }
+                if (mzBlRecord.fzZl != null && mzBlRecord.fzZl != "") {
+                    $("#fzZlBlrecord").text(mzBlRecord.fzZl);
+                    $("#fzZlBlrecord").parent().css("display", "block");
+                } else {
+                    $("#fzZlBlrecord").parent().css("display", "none");
+                }
                 if (mzBlRecord.obstericalHistory != null && mzBlRecord.obstericalHistory != "") {
                     $("#obstericalHistoryBlrecord").text(mzBlRecord.obstericalHistory);
                     $("#obstericalHistoryBlrecord").parent().css("display", "block");
@@ -12586,6 +12611,7 @@ function showMzBlRecordModal(patientId, times, type) {
                 $("#editEmrPs").val(mzBlRecord.emrPs == null ? "" : mzBlRecord.emrPs);
                 $("#editPersonalHistory").val(mzBlRecord.personalHistory == null ? "" : mzBlRecord.personalHistory);
                 $("#editFamilyHistory").val(mzBlRecord.familyHistory == null ? "" : mzBlRecord.familyHistory);
+                $("#editFzZl").val(mzBlRecord.fzZl == null ? "" : mzBlRecord.fzZl);
                 $("#editObstericalHistory").val(mzBlRecord.obstericalHistory == null ? "" : mzBlRecord.obstericalHistory);
                 $("#editQtjc").val(mzBlRecord.emrPe == null ? "" : mzBlRecord.emrPe);
                 setSelectedAttr("editZd", mzBlRecord.icdCode, mzBlRecord.icdText);
@@ -12707,6 +12733,7 @@ function clearInput() {
     $("#editEmrPs").val(null);
     $("#editPersonalHistory").val(null);
     $("#editFamilyHistory").val(null);
+    $("#editFzZl").val(null);
     $("#editObstericalHistory").val(null);
     $("#bl_weight").val(null);
     $("#bl_sphygmus").val(null);
@@ -12795,6 +12822,7 @@ function sendEmrProcess() {
             "emrPs": $("#editEmrPs").val(),
             "personalHistory": $("#editPersonalHistory").val(),
             "familyHistory": $("#editFamilyHistory").val(),
+            "fzZl": $("#editFzZl").val(),
             "obstericalHistory": $("#editObstericalHistory").val(),
             "emrPe": $("#editQtjc").val(),
             "weight": $("#bl_weight").val(),

+ 17 - 0
src/main/resources/static/js/mz/mz_bl_record.js

@@ -352,12 +352,26 @@ function printBlRecord(patientId, times, printType) {
                 } else {
                     $("#personalHistoryBlrecord").parent().css("display", "none");
                 }
+                if (mzBlRecord.fzZl != null && mzBlRecord.fzZl != "") {
+                    $("#fzZlBlrecord").text(mzBlRecord.fzZl);
+                    $("#fzZlBlrecord").parent().css("display", "block");
+                } else {
+                    $("#fzZlBlrecord").parent().css("display", "none");
+                }
+
                 if (mzBlRecord.familyHistory != null && mzBlRecord.familyHistory != "") {
                     $("#familyHistoryBlrecord").text(mzBlRecord.familyHistory);
                     $("#familyHistoryBlrecord").parent().css("display", "block");
                 } else {
                     $("#familyHistoryBlrecord").parent().css("display", "none");
                 }
+                if (mzBlRecord.fzZl != null && mzBlRecord.fzZl != "") {
+                    $("#fzZlBlrecord").text(mzBlRecord.fzZl);
+                    $("#fzZlBlrecord").parent().css("display", "block");
+                } else {
+                    $("#fzZlBlrecord").parent().css("display", "none");
+                }
+
                 if (mzBlRecord.obstericalHistory != null && mzBlRecord.obstericalHistory != "") {
                     $("#obstericalHistoryBlrecord").text(mzBlRecord.obstericalHistory);
                     $("#obstericalHistoryBlrecord").parent().css("display", "block");
@@ -532,6 +546,7 @@ function showMzBlRecordModal(patientId, times, type) {
                 $("#editEmrHpi").val(mzBlRecord.emrHpi == null ? "" : mzBlRecord.emrHpi);
                 $("#editEmrPs").val(mzBlRecord.emrPs == null ? "" : mzBlRecord.emrPs);
                 $("#editPersonalHistory").val(mzBlRecord.personalHistory == null ? "" : mzBlRecord.personalHistory);
+                $("#editFzZl").val(mzBlRecord.fzZl == null ? "" : mzBlRecord.fzZl);
                 $("#editFamilyHistory").val(mzBlRecord.familyHistory == null ? "" : mzBlRecord.familyHistory);
                 $("#editObstericalHistory").val(mzBlRecord.obstericalHistory == null ? "" : mzBlRecord.obstericalHistory);
                 $("#editQtjc").val(mzBlRecord.emrPe == null ? "" : mzBlRecord.emrPe);
@@ -879,6 +894,7 @@ function sendEmrProcess() {
             "emrHpi": $("#editEmrHpi").val(),
             "emrPs": $("#editEmrPs").val(),
             "personalHistory": $("#editPersonalHistory").val(),
+            "fzZl": $("#editFzZl").val(),
             "familyHistory": $("#editFamilyHistory").val(),
             "obstericalHistory": $("#editObstericalHistory").val(),
             "emrPe": $("#editQtjc").val(),
@@ -926,6 +942,7 @@ function clearInput() {
     $("#editEmrHpi").val(null);
     $("#editEmrPs").val(null);
     $("#editPersonalHistory").val(null);
+    $("#editFzZl").val(null);
     $("#editFamilyHistory").val(null);
     $("#editObstericalHistory").val(null);
     $("#bl_weight").val(null);

+ 2 - 0
src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -1883,6 +1883,7 @@ function showMzBlRecordModal(patientId, times, type) {
                 $("#editEmrHpi").val(mzBlRecord.emrHpi == null ? "" : mzBlRecord.emrHpi);
                 $("#editEmrPs").val(mzBlRecord.emrPs == null ? "" : mzBlRecord.emrPs);
                 $("#editPersonalHistory").val(mzBlRecord.personalHistory == null ? "" : mzBlRecord.personalHistory);
+                $("#editFzZl").val(mzBlRecord.fzZl == null ? "" : mzBlRecord.fzZl);
                 $("#editFamilyHistory").val(mzBlRecord.familyHistory == null ? "" : mzBlRecord.familyHistory);
                 $("#editObstericalHistory").val(mzBlRecord.obstericalHistory == null ? "" : mzBlRecord.obstericalHistory);
                 $("#editQtjc").val(mzBlRecord.emrPe == null ? "" : mzBlRecord.emrPe);
@@ -2026,6 +2027,7 @@ function clearInput() {
     $("#editEmrHpi").val(null);
     $("#editEmrPs").val(null);
     $("#editPersonalHistory").val(null);
+    $("#editFzZl").val(null);
     $("#editFamilyHistory").val(null);
     $("#editObstericalHistory").val(null);
     $("#bl_weight").val(null);

+ 24 - 0
src/main/resources/templates/mz/clinic.html

@@ -444,6 +444,10 @@
                         <input id="personalHistory" class="form-control my_label_input"
                                placeholder="请输入" type="text" data-placement="bottom-right">
                     </div>
+                    <div class="item form-group customization" id="fzZlFlag" target-id="fzZl">
+                        <label class="my_label">辅助资料:</label>
+                        <textarea id="fzZl" class="form-control my_label_input" placeholder="请输入"></textarea>
+                    </div>
                     <div class="item form-group customization" id="familyHistoryFlag" target-id="familyHistory">
                         <label class="my_label">家族史:</label>
                         <input id="familyHistory" class="form-control my_label_input"
@@ -2404,6 +2408,9 @@
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
                                 <input type="checkbox" class="flat" id="familyHistoryFlagCheck">&nbsp;&nbsp;家族史
                             </label>
+                            <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
+                                <input type="checkbox" class="flat" id="fzZlFlagCheck">&nbsp;&nbsp;辅助资料
+                            </label>
                             <label style="padding-left: 0px;" class="col-md-3 col-sm-3 col-xs-3">
                                 <input type="checkbox" class="flat" id="obstericalHistoryFlagCheck">&nbsp;&nbsp;婚育史
                             </label>
@@ -2995,6 +3002,13 @@
                         <td colspan="7" id="familyHistoryBlrecord"
                             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: 30px;">
+                            辅助资料
+                        </td>
+                        <td colspan="7" id="fzZlBlrecord"
+                            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: 30px;">
                             婚育史
@@ -3698,6 +3712,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFzZl">辅助资料
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="editFzZl" class="form-control col-md-7 col-xs-12"
+                                          type="text"></textarea>
+                            </div>
+                        </div>
+                    </div>
                     <div class="item form-group thmz_alert">
                         <div class="col-md-12 col-sm-12 col-xs-12 item">
                             <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editObstericalHistory">婚育史

+ 17 - 0
src/main/resources/templates/mz/mz_bl_record.html

@@ -122,6 +122,13 @@
                         <td colspan="7" id="personalHistoryBlrecord"
                             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: 30px;">
+                            辅助资料
+                        </td>
+                        <td colspan="7" id="fzZlBlrecord"
+                            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: 30px;">
                             家族史
@@ -269,6 +276,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFzZl">辅助资料
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="editFzZl" class="form-control col-md-7 col-xs-12"
+                                          type="text"></textarea>
+                            </div>
+                        </div>
+                    </div>
                     <div class="item form-group thmz_alert">
                         <div class="col-md-12 col-sm-12 col-xs-12 item">
                             <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFamilyHistory">家族史

+ 10 - 0
src/main/resources/templates/mz/west_pharmacy_send.html

@@ -665,6 +665,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFzZl">辅助资料
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <textarea id="editFzZl" class="form-control col-md-7 col-xs-12"
+                                          type="text" disabled></textarea>
+                            </div>
+                        </div>
+                    </div>
                     <div class="item form-group thmz_alert">
                         <div class="col-md-12 col-sm-12 col-xs-12 item">
                             <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editFamilyHistory">家族史