皮试用药逻辑优化

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpZdDictMapper.java

@@ -14,7 +14,7 @@ public interface YpZdDictMapper {
      * @param code
      * @return
      */
-    @Select("select code,name,specification,mz_restrict,bill_item_mz,bill_item_zy,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,isnull(byj_flag,0) byj_flag,national_code,prescription_limit_days,pzwh,dosage,drug_kind,wg_type,isnull(rtrim(jb_flag),0) jb_flag from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} and serial = #{serial}")
+    @Select("select code,name,specification,mz_restrict,bill_item_mz,bill_item_zy,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,isnull(byj_flag,0) byj_flag,national_code,prescription_limit_days,pzwh,dosage,drug_kind,wg_type,isnull(rtrim(jb_flag),0) jb_flag,categories_flag from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} and serial = #{serial}")
     YpZdDict selectYpZdDictByCodeAndSerial(@Param("code") String code,@Param("serial") String serial);
 
     /**
@@ -24,7 +24,7 @@ public interface YpZdDictMapper {
      * @return
      */
     @Select({"<script>",
-            "select code,name,specification,mz_restrict,bill_item_mz,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,prescription_limit_days from yp_zd_dict WITH(NOLOCK)",
+            "select code,name,specification,mz_restrict,bill_item_mz,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,prescription_limit_days,pzwh,dosage,drug_kind,wg_type,isnull(rtrim(jb_flag),0) jb_flag,categories_flag from yp_zd_dict WITH(NOLOCK)",
             "<when test='codes!=null'>",
             " where code in",
             "<foreach item='item' index='index' collection='codes' open='(' separator=',' close=')'>",
@@ -42,7 +42,7 @@ public interface YpZdDictMapper {
      * @param code
      * @return
      */
-    @Select("select code,name,specification,mz_restrict,bill_item_mz,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,prescription_limit_days from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} ")
+    @Select("select code,name,specification,mz_restrict,bill_item_mz,pack_retprice,country_flag,supply_type,pack_unit,weight,volum,weigh_unit,vol_unit,pack_size,manu_code,frequency,serial,drug_flag,mini_unit,ps_flag,retprice,fix_price,buy_price,prescription_limit_days,pzwh,dosage,drug_kind,wg_type,isnull(rtrim(jb_flag),0) jb_flag,categories_flag from yp_zd_dict WITH(NOLOCK) where code = #{code,jdbcType=VARCHAR} ")
     List<YpZdDict> selectYpZdDictByCode(@Param("code") String code);
 
     /**

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

@@ -2505,7 +2505,6 @@ function editPrescription(jsonData, type) {
                 //appendGroupOrder()
                 $("#groupId").selectpicker('val', groupOrder);
                 $('#groupId').selectpicker('refresh');
-
                 checkYpInfo(code, serial, groupNo, false, mzChargeDetail.orderNo);
                 // 给药方式 同组药品给药方式相同
                 $("#supplyType").selectpicker('val', mzChargeDetail.supplyCode);
@@ -2520,9 +2519,10 @@ function editPrescription(jsonData, type) {
                 $("#orderFrequency").selectpicker('val', mzChargeDetail.frequency);
                 $('#orderFrequency').selectpicker('refresh');
                 if (mzChargeDetail.tryFlag == 1 || mzChargeDetail.tryFlag == "1") {
-                    $("#tryFlag").parent().addClass("checked");
-                } else {
-                    $("#tryFlag").parent().removeClass("checked");
+                    var tryFlag = $("#tryFlag").parent().hasClass("checked");
+                    if(tryFlag==false || tryFlag=="false"){
+                        $("#tryFlag").parent().parent().click();
+                    }
                 }
                 if (mzChargeDetail.tryResult != null && mzChargeDetail.tryResult != "null" && mzChargeDetail.tryResult != "") {
                     $("#tryResult").selectpicker('val', mzChargeDetail.tryResult);
@@ -3587,6 +3587,7 @@ function arrowDown(obj) {
  * @param obj
  */
 function editWesternMedicine(obj) {
+    clearWesternMedicine(true);
     //是新增药品还是编辑 true 修改 默认false
     $("#western_medicine_update_flag").val(true);
     var parentObject = $(obj).parent();
@@ -3627,13 +3628,7 @@ function editWesternMedicine(obj) {
     //皮试
     var tryFlag = $(parentObject).find("input.temporary_items_tryFlag").val();
     if (tryFlag == true || tryFlag == "true") {
-        $("#tryFlag").parent().addClass("checked");
-        $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
-        $("#tryResult").parent().parent().parent().removeClass("in").addClass("hide");
-    } else {
-        $("#tryFlag").parent().removeClass("checked");
-        $("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
-        $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+        $("#tryFlag").parent().parent().click();
     }
     //皮试结果
     var tryResult = $(parentObject).find("input.temporary_items_tryResult").val();
@@ -3690,11 +3685,11 @@ function editWesternMedicine(obj) {
                         $('#packUnit').selectpicker('refresh');
                     }
                     if (res.data.psFlag != null && (res.data.psFlag == 1 || res.data.psFlag == "1")) {
-                        $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
-                        $("#tryResult").parent().parent().parent().removeClass("in").addClass("hide");
-                    } else {
-                        $("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
-                        $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+                        if(res.data.categoriesFlag==0 || res.data.categoriesFlag=="0"){
+                            $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+                        }else if(res.data.categoriesFlag==2 || res.data.categoriesFlag=="2"){
+                            $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
+                        }
                     }
                     //厂家名称
                     $("#manufactoryName").val(res.data.manufactoryName);
@@ -4327,9 +4322,12 @@ function clearWesternMedicine(flag) {
     $("#medicalAdvice").selectpicker('val', null);
     $('#medicalAdvice').selectpicker('refresh');
     //皮试
-    $("#tryFlag").parent().removeClass('checked');
+    var tryFlag = $("#tryFlag").parent().hasClass("checked");
+    if(tryFlag==true || tryFlag=="true"){
+        $("#tryFlag").parent().parent().click();
+    }
     $("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
-    $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+    $("#tryResult").parent().parent().parent().removeClass("in").addClass("hide");
     //皮试结果
     $("#tryResult").selectpicker('val', null);
     $('#tryResult').selectpicker('refresh');
@@ -6666,13 +6664,17 @@ function fitWesternMedicine(res, groupNo) {
         $('#orderFrequency').selectpicker('refresh');
     }
     if (res.data.psFlag != null && (res.data.psFlag == 1 || res.data.psFlag == "1")) {
-        $("#tryFlag").parent().addClass("checked");
-        $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
-        $("#tryResult").parent().parent().parent().removeClass("in").addClass("hide");
-    } else {
-        $("#tryFlag").parent().removeClass("checked");
-        $("#tryFlag").parent().parent().parent().removeClass("in").addClass("hide");
-        $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+        if(res.data.categoriesFlag==0 || res.data.categoriesFlag=="0"){
+            //口服药选择皮试结果
+            $("#tryResult").parent().parent().parent().removeClass("hide").addClass("in");
+        }else  if(res.data.categoriesFlag==2 || res.data.categoriesFlag=="2"){
+            //针剂需要皮试
+            $("#tryFlag").parent().parent().parent().removeClass("hide").addClass("in");
+            var tryFlag = $("#tryFlag").parent().hasClass("checked");
+            if(tryFlag==false || tryFlag=="false"){
+                $("#tryFlag").parent().parent().click();
+            }
+        }
     }
     $("#manufactoryName").val(res.data.manufactoryName);
     $("#specification").val(res.data.specification);

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

@@ -611,7 +611,7 @@
                                                 <input type="checkbox" class="flat" id="tryFlag">&nbsp;&nbsp;皮试
                                             </label>
                                         </div>
-                                        <div style="margin-left: 13px;width: 85px;float: left;">
+                                        <div class="hide" style="margin-left: 13px;width: 85px;float: left;">
                                             <label style="padding-left: 0px;">
                                                 <select class="form-control selectpicker show-tick"
                                                         title="皮试结果" data-live-search="true"