病历列表优化

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

@@ -494,71 +494,71 @@ function showMzBlRecordModal(patientId, times) {
                 // }
                 if (mzBlRecord.emrChiefComplaint != null && mzBlRecord.emrChiefComplaint != "") {
                     $("#editEmrChiefComplaint").val(mzBlRecord.emrChiefComplaint);
-                    $("#editEmrChiefComplaint").parent().parent().css("display", "block");
+                    $("#editEmrChiefComplaint").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editEmrChiefComplaint").parent().parent().css("display", "none");
+                    $("#editEmrChiefComplaint").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.emrHpi != null && mzBlRecord.emrHpi != "") {
                     $("#editEmrHpi").val(mzBlRecord.emrHpi);
-                    $("#editEmrHpi").parent().parent().css("display", "block");
+                    $("#editEmrHpi").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editEmrHpi").parent().parent().css("display", "none");
+                    $("#editEmrHpi").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.emrPs != null && mzBlRecord.emrPs != "") {
                     $("#editEmrPs").val(mzBlRecord.emrPs);
-                    $("#editEmrPs").parent().parent().css("display", "block");
+                    $("#editEmrPs").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editEmrPs").parent().parent().css("display", "none");
+                    $("#editEmrPs").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.personalHistory != null && mzBlRecord.personalHistory != "") {
                     $("#editPersonalHistory").val(mzBlRecord.personalHistory);
-                    $("#editPersonalHistory").parent().parent().css("display", "block");
+                    $("#editPersonalHistory").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editPersonalHistory").parent().parent().css("display", "none");
+                    $("#editPersonalHistory").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.familyHistory != null && mzBlRecord.familyHistory != "") {
                     $("#editFamilyHistory").val(mzBlRecord.familyHistory);
-                    $("#editFamilyHistory").parent().parent().css("display", "block");
+                    $("#editFamilyHistory").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editFamilyHistory").parent().parent().css("display", "none");
+                    $("#editFamilyHistory").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.obstericalHistory != null && mzBlRecord.obstericalHistory != "") {
                     $("#editObstericalHistory").val(mzBlRecord.obstericalHistory);
-                    $("#editObstericalHistory").parent().parent().css("display", "block");
+                    $("#editObstericalHistory").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editObstericalHistory").parent().parent().css("display", "none");
+                    $("#editObstericalHistory").parent().parent().parent().css("display", "none");
                 }
                 var tz = getTz(mzBlRecord);
                 if (tz != null && tz != "") {
                     $("#editTgjc").val(tz);
-                    $("#editTgjc").parent().parent().css("display", "block");
+                    $("#editTgjc").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editTgjc").parent().parent().css("display", "none");
+                    $("#editTgjc").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.emrPe != null && mzBlRecord.emrPe != "") {
                     $("#editQtjc").val(mzBlRecord.emrPe);
-                    $("#editQtjc").parent().parent().css("display", "block");
+                    $("#editQtjc").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editQtjc").parent().parent().css("display", "none");
+                    $("#editQtjc").parent().parent().parent().css("display", "none");
                 }
                 if (res.icdText != null && res.icdText != "") {
                     $("#editZd").val(res.icdText);
-                    $("#editZd").parent().parent().css("display", "block");
+                    $("#editZd").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editZd").parent().parent().css("display", "none");
+                    $("#editZd").parent().parent().parent().css("display", "none");
                 }
                 if (mzBlRecord.emrProcess != null && mzBlRecord.emrProcess != "") {
                     var reg = new RegExp("</br>","g");//g,表示全部替换。
                     $("#editEmrProcess").val(mzBlRecord.emrProcess.replace(reg,"\n"));
-                    $("#editEmrProcess").parent().parent().css("display", "block");
+                    $("#editEmrProcess").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editEmrProcess").parent().parent().css("display", "none");
+                    $("#editEmrProcess").parent().parent().parent().css("display", "none");
                 }
-                if (mzBlRecord.emrJkjy != null && mzBlRecord.emrJkjy != "") {
-                    $("#editEmrJkjy").text(mzBlRecord.emrJkjy);
-                    $("#editEmrJkjy").parent().parent().css("display", "block");
+                if (mzBlRecord.emrJkjy != null && mzBlRecord.emrJkjy != "" && mzBlRecord.emrJkjy != "无") {
+                    $("#editEmrJkjy").val(mzBlRecord.emrJkjy);
+                    $("#editEmrJkjy").parent().parent().parent().css("display", "block");
                 } else {
-                    $("#editEmrJkjy").parent().parent().css("display", "none");
+                    $("#editEmrJkjy").parent().parent().parent().css("display", "none");
                 }
                 $("#mzBlTimes").val(mzBlRecord.times);
                 $("#editMzBlRecordModal").modal();

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

@@ -305,19 +305,19 @@
                     </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="newEmrProcess">补充处理（RP.）
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="editEmrJkjy">健康教育
                             </label>
                             <div class="col-md-8 col-sm-8 col-xs-12">
-                                <textarea id="newEmrProcess" class="form-control col-md-7 col-xs-12" style="min-height: 100px;"></textarea>
+                                <textarea id="editEmrJkjy" class="form-control col-md-7 col-xs-12" style="min-height: 80px;"></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="editEmrJkjy">健康教育
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="newEmrProcess">补充处理（RP.）
                             </label>
                             <div class="col-md-8 col-sm-8 col-xs-12">
-                                <textarea id="editEmrJkjy" class="form-control col-md-7 col-xs-12"></textarea>
+                                <textarea id="newEmrProcess" class="form-control col-md-7 col-xs-12" style="min-height: 80px;"></textarea>
                             </div>
                         </div>
                     </div>