临时解决处方调用多了以后显示多个content的bug

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

@@ -1790,43 +1790,54 @@ function realClinicalReception(patientId, serialNo) {
  */
 function clearWorkSpace() {
     clearUser(true);
-    clearWorkSpaceExcludeUser();
+    clearWorkSpaceExcludeUser(1);
 }
 
 
 /**
  * 清空工作台除了用户信息
- */
-function clearWorkSpaceExcludeUser() {
-    $("#symptom").val(null);
-    $("#emrHpi").val(null);
-    $("#emrPs").val(null);
-    $("#personalHistory").val(null);
-    $("#familyHistory").val(null);
-
-    $("#obstericalHistory").val(null);
-    $("#weight").val(null);
-    $("#temperature").val(null);
-    $("#sphygmus").val(null);
-    $("#breathe").val(null);
-    $("#pressure_high").val(null);
-    $("#pressure_floor").val(null);
-    $("#pressure_high_left").val(null);
-    $("#pressure_floor_left").val(null);
-    $("#tentativeDiagnosis").val(null);
-    $("#otherCheck").val(null);
-    $("#diagnoseValue").val(null);
-    $("#diagnoseTags").html(null);
-    $("#healthEducation").val(null);
-    clearWesternMedicine(true);
-    clearChineseMedicine();
-    clearJyJcItem();
-    clearZyReq();
-    //initNavTabs(0);
-    clearNavTabs(0);
-    clearNavTabs(1);
-    clearNavTabs(2);
-    clearNavTabs(3);
+ * @param source 1 清空工作台 2 调用模板  3 调用历史处方
+ */
+function clearWorkSpaceExcludeUser(source) {
+    var conciseRecordsFlag=false;
+    if(source==2){
+        conciseRecordsFlag=$("#conciseRecordsYlfw").parent().hasClass("checked");
+    }else  if(source==3){
+        conciseRecordsFlag=$("#conciseRecordsJzxq").parent().hasClass("checked");
+    }
+    if(source==1 || conciseRecordsFlag){
+        $("#symptom").val(null);
+        $("#emrHpi").val(null);
+        $("#emrPs").val(null);
+        $("#personalHistory").val(null);
+        $("#familyHistory").val(null);
+        $("#obstericalHistory").val(null);
+        $("#weight").val(null);
+        $("#temperature").val(null);
+        $("#sphygmus").val(null);
+        $("#breathe").val(null);
+        $("#pressure_high").val(null);
+        $("#pressure_floor").val(null);
+        $("#pressure_high_left").val(null);
+        $("#pressure_floor_left").val(null);
+        $("#tentativeDiagnosis").val(null);
+        $("#otherCheck").val(null);
+        $("#diagnoseValue").val(null);
+        $("#diagnoseTags").html(null);
+        $("#healthEducation").val(null);
+    }
+    if(source==1){
+        clearWesternMedicine(true);
+        clearChineseMedicine();
+        clearJyJcItem();
+        clearZyReq();
+        //initNavTabs(0);
+        clearNavTabs(0);
+        clearNavTabs(1);
+        clearNavTabs(2);
+        clearNavTabs(3);
+        clearNavTabs(4);
+    }
     clearApidAcceptsModal();
     $("#totalAmount").text(0);
 }
@@ -2239,7 +2250,7 @@ function editPrescription(jsonData, type) {
  * 调用医疗范文
  */
 function callTemplate() {
-    clearWorkSpaceExcludeUser();
+    clearWorkSpaceExcludeUser(2);
     $.ajax({
         type: "GET",
         url: '/thmz/increaseNumber?id=' + $("#idTemplate").val(),
@@ -4021,6 +4032,17 @@ function clearZyReq() {
  * 计算总金额
  */
 function calculateTotalAmount() {
+    // var tableId = $("#xyTab li.active").find("a").attr("href");
+    // if(tableId!=null){
+    //     //去除第一个字符 #
+    //     tableId=tableId.slice(1);
+    // }
+    // $("#xyTabContent div.active ").each(function (index,obj) {
+    //     $("#xyTab").find("a[href='#"+$(obj).attr("id")+"']").off("click").tab('show');
+    //     if($(obj).attr("id")!=tableId){
+    //         $(obj).removeClass("active").removeClass("in");
+    //     }
+    // });
     var jsonData = getParamsForpPrescription();
     $.ajax({
         type: "POST",
@@ -4157,6 +4179,13 @@ function billItemButtonChange(object, objectIndex) {
     $("#zlItem").webuiPopover('hide');
     if (objectIndex == 0) {
         $("#western_medicine_name").focus();
+        //有时候调用药品多了以后，会导致一个药品处方名对应多个content显现
+        var paneId = $("#xyTab li.active").find("a").attr("href");
+        if(paneId!=null){
+            //去除第一个字符 #
+            paneId=paneId.slice(1);
+            xyTableOnClick(paneId)
+        }
     } else if (objectIndex == 1) {
         $("#chinese_medicine_name").focus();
     } else if (objectIndex == 2) {
@@ -5166,7 +5195,7 @@ function checkYpInfo(code, serial, groupNo, needNotice) {
                         for (var i = 0; i < currentGroupNos.length; i++) {
                             if ($(currentGroupNos[i]).val() == groupNo) {
                                 var next = $(currentGroupNos[i]).next();
-                                if ($(next).children().length < 5) {
+                                if (needAddTable && $(next).children().length < 5) {
                                     var parentId = $(currentGroupNos[i]).parent().attr("id");
                                     //切换处方
                                     $("#xyTab").find("a[href='#" + parentId + "']").off("click").tab('show');
@@ -5478,16 +5507,30 @@ function loadZlItemList(event) {
                 align: "center",
                 valign: 'middle',
                 // sortable: true
-            }, {
-                field: 'type',
-                title: '项目类型',
+            }
+            // , {
+            //     field: 'type',
+            //     title: '项目类型',
+            //     align: "center",
+            //     valign: 'middle',
+            //     // sortable: true
+            //     formatter: function (value, row, index) {
+            //         return "诊疗";
+            //     }
+            // }
+            ,{
+                field: 'chargeAmount',
+                title: '价格',
                 align: "center",
                 valign: 'middle',
                 // sortable: true
                 formatter: function (value, row, index) {
-                    return "诊疗";
+                    if(value==null){
+                        return "0.00元";
+                    }
+                    return value.toFixed(2)+"元";
                 }
-            },
+            }
         ],
         responseHandler: function (res) {
             if (res == '401' || res == 401) {
@@ -5850,7 +5893,12 @@ function initNavTabs(index) {
         paneId = "zyReqcf_" + getUID();
         cfdesc = '入院';
     }
-    $("#" + tabId).html('<li class="active"><a href="#' + paneId + '" role="tab" data-toggle="tab">处方 <small class="cfdesc">(' + cfdesc + ')</small></a></li>');
+    var tabHtml = '<li class="active"><a href="#' + paneId + '" role="tab" data-toggle="tab" ';
+    if(index==0){
+        tabHtml+=' onclick=xyTableOnClick("'+paneId+'")';
+    }
+    tabHtml+='>处方 <small class="cfdesc">(' + cfdesc + ')</small></a></li>';
+    $("#" + tabId).html(tabHtml);
     var html = '<div class="tab-pane fade in active" id="' + paneId + '" style="height: 100%;min-height: 285px;position: relative;">';
     html += '<img src="/thmz/images/prescription.png" style="margin-top: 5px;"/>';
     html += '<input class="current_groupNo" type="hidden"/>';
@@ -6015,7 +6063,12 @@ function refreshNavTabs(index, groupNo) {
     var paneId = paneIdPrfix + getUID();
     //清除选中的样式
     $("#" + tabId).find("li.active").removeClass("active");
-    $("#" + tabId).append('<li><a href="#' + paneId + '" role="tab" data-toggle="tab">' + cfTitle + '</a></li>');
+    var tabHtml = '<li><a href="#' + paneId + '" role="tab" data-toggle="tab"';
+    if(index==0){
+        tabHtml+=' onclick=xyTableOnClick("'+paneId+'")';
+    }
+    tabHtml+='>' + cfTitle + '</a></li>';
+    $("#" + tabId).append(tabHtml);
     var html = '<div class="tab-pane fade in active" id="' + paneId + '" style="height: 100%;min-height: 285px;position: relative;">' +
         '<img src="/thmz/images/prescription.png" style="margin-top: 5px;"/>' +
         '<input class="current_groupNo" type="hidden"/>' +
@@ -7115,7 +7168,7 @@ function getMzPrescriptionVoPaid(patientId, times, clnicId) {
                 if (res.code == 0) {
                     var mzfzSerialNoInClick = $("#mzfzSerialNoInClick").val();
                     clearUser(false);
-                    clearWorkSpaceExcludeUser();
+                    clearWorkSpaceExcludeUser(3);
                     setMzPatientInfo(res.mzPatientMi);
                     editPrescription(res.data, 2)
                     $("#mzfzSerialNoInClick").val(mzfzSerialNoInClick);
@@ -9595,4 +9648,23 @@ function siReadCard() {
         }
     });
     // window.open('ReadCard://'+prm, '_self')
+}
+
+
+/**
+ * 西药品类按钮点击事件 因为原插件有点未解决bug，点击title的时候，加载的列表非对应的，
+ * @param paneId
+ */
+function xyTableOnClick(paneId) {
+    setTimeout(function () {
+        $("#xyTabContent div").each(function (index,obj) {
+           // $("#xyTab").find("a[href='#"+$(obj).attr("id")+"']").off("click").tab('show');
+            if($(obj).attr("id")==paneId){
+                $(obj).addClass("active").addClass("in");
+            }else {
+                $(obj).removeClass("active").removeClass("in");
+            }
+        });
+    }, 400);
+
 }

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

@@ -974,7 +974,7 @@
                         <label class="my_label">健康教育：</label>
                         <!--   <input id="emrHpi" class="form-control my_label_input"
                                   placeholder="请输入" type="text" data-placement="bottom-right">-->
-                        <textarea id="healthEducation" class="form-control my_label_input" placeholder="请输入"></textarea>
+                        <textarea id="healthEducation" class="form-control my_label_input" placeholder="请输入" style="height: 250px;"></textarea>
                     </div>
                 </form>
             </div>

src/test/java/cn/hnthyy/thmz/HotelTimeTest.java

@@ -1,9 +1,11 @@
 package cn.hnthyy.thmz;
 
+import cn.hnthyy.thmz.Utils.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 
 import java.math.BigDecimal;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,6 +48,13 @@ public class HotelTimeTest {
         BigDecimal totalPayable = new BigDecimal("587.56");
         totalPayable=totalPayable.setScale(2, BigDecimal.ROUND_HALF_UP);
         System.out.println(totalPayable);
+
+        Calendar ca = Calendar.getInstance();
+        ca.set(Calendar.YEAR,2022);
+        ca.set(Calendar.MONTH,5);
+        ca.set(Calendar.DAY_OF_MONTH,1);
+        ca.add(Calendar.DAY_OF_YEAR,173);
+        System.out.println(DateUtil.fomart(ca.getTime(),"yyyy-MM-dd HH:mm:ss"));
     }