4项可配置

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

@@ -50,4 +50,6 @@ public class JcZdItem extends PageBean implements Serializable {
     private Integer maxAgeRestriction;
     //报告时限
     private String timeLimit;
+
+    private String jcDialog;
 }

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

@@ -68,4 +68,6 @@ public class JyZdItem extends PageBean implements Serializable {
     private Integer maxAgeRestriction;
     //报告时限
     private String timeLimit;
+
+    private String jyDialog;
 }

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JcZdItemMapper.java

@@ -12,7 +12,7 @@ public interface JcZdItemMapper {
      * @return
      */
     @Select("select rtrim(code) code,name,rtrim(class) class_code,py_code,d_code wb_code,rtrim(del_flag) del_flag,rtrim(exec_unit) exec_unit,rtrim(tj_flag) tj_flag," +
-            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code,exec_address, " +
+            "rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,bw_code,group_code,exec_address,isnull(jc_dialog,'0') as jc_dialog, " +
             "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
             "from jc_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JcZdItem selectJcZdItemByCode(@Param("code") String code);
@@ -115,10 +115,10 @@ public interface JcZdItemMapper {
      * @return
      */
     @Insert("if not exists (select name  from jc_zd_item WITH(NOLOCK) where code=#{code} or zy_order_code=#{zyOrderCode} or mz_code=#{mzCode}) " +
-            "INSERT INTO jc_zd_item(class, code, name, py_code, d_code, del_flag, exec_unit, zy_flag, zy_order_code, mz_flag, mz_code, bw_code, " +
+            "INSERT INTO jc_zd_item(class, code, name, py_code, d_code, del_flag, exec_unit, zy_flag, zy_order_code, mz_flag, mz_code, bw_code,jc_dialog, " +
             "group_code,wx_bookable_flag,exec_address, gender_restriction, min_age_restriction, max_age_restriction, time_limit) " +
             "VALUES (#{classCode}, #{code}, #{name}, #{pyCode}, #{wbCode}, #{delFlag}, #{execUnit}, #{zyFlag}, #{zyOrderCode}, #{mzFlag}, " +
-            "#{mzCode}, #{bwCode}, #{groupCode}, 0,#{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction}, #{timeLimit})")
+            "#{mzCode}, #{bwCode},#{jcDialog}, #{groupCode}, 0,#{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction}, #{timeLimit})")
     int insertJcZdItem(JcZdItem jcZdItem);
 
     /**
@@ -178,6 +178,9 @@ public interface JcZdItemMapper {
             "<when test='wbCode!=null'>",
             ",d_code =#{wbCode}",
             "</when>",
+            "<when test='jcDialog!=null'>",
+            ",jc_dialog =#{jcDialog}",
+            "</when>",
             "<when test='zyFlag!=null'>",
             ",zy_flag =#{zyFlag}",
             "</when>",

src/main/java/cn/hnthyy/thmz/mapper/his/zd/JyZdItemMapper.java

@@ -13,7 +13,7 @@ public interface JyZdItemMapper {
      * @return
      */
     @Select("select rtrim(code) code,name,rtrim(class) class_code,rtrim(exec_unit) exec_unit,vessel,dosage,rtrim(sample_code) sample_code,py_code,d_code wb_code," +
-            "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times,exec_address, " +
+            "rtrim(del_flag) del_flag,rtrim(zy_flag) zy_flag,zy_order_code,rtrim(mz_flag) mz_flag,mz_code,cx_times,exec_address,isnull(jy_dialog,'0') as jy_dialog,  " +
             "gender_restriction, min_age_restriction, max_age_restriction, time_limit " +
             "from jy_zd_item WITH(NOLOCK) where code=#{code,jdbcType=CHAR}")
     JyZdItem selectJyZdItemByCode(@Param("code") String code);
@@ -149,9 +149,9 @@ public interface JyZdItemMapper {
      * @return
      */
     @Insert("if not exists (select name  from jy_zd_item WITH(NOLOCK) where code=#{code} or zy_order_code=#{zyOrderCode} or mz_code=#{mzCode}) " +
-            "INSERT INTO jy_zd_item(code, name, class, exec_unit, vessel, sample_code, py_code, d_code, del_flag, zy_flag, zy_order_code, " +
+            "INSERT INTO jy_zd_item(code, name, class, exec_unit, vessel, sample_code, py_code, d_code, del_flag, zy_flag, zy_order_code,jy_dialog, " +
             "mz_flag, mz_code,exec_address, gender_restriction, min_age_restriction, max_age_restriction, time_limit) " +
-            "VALUES (#{code}, #{name}, #{classCode}, #{execUnit}, #{vessel}, #{sampleCode}, #{pyCode}, #{wbCode}, #{delFlag}, #{zyFlag}, #{zyOrderCode}, " +
+            "VALUES (#{code}, #{name}, #{classCode}, #{execUnit}, #{vessel}, #{sampleCode}, #{pyCode}, #{wbCode}, #{delFlag}, #{zyFlag}, #{zyOrderCode},#{jyDialog}, " +
             "#{mzFlag}, #{mzCode}, #{execAddress}, #{genderRestriction}, #{minAgeRestriction}, #{maxAgeRestriction}, #{timeLimit})")
     int insertJyZdItem(JyZdItem jyZdItem);
 
@@ -211,6 +211,9 @@ public interface JyZdItemMapper {
             "<when test='wbCode!=null'>",
             ",d_code =#{wbCode}",
             "</when>",
+            "<when test='jyDialog!=null'>",
+            ",jy_dialog =#{jyDialog}",
+            "</when>",
             "<when test='zyFlag!=null'>",
             ",zy_flag =#{zyFlag}",
             "</when>",

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

@@ -169,6 +169,7 @@ function saveJcZdItem() {
             delFlag: $("#delFlag").val(),
             zyFlag: $("#zyFlag").val(),
             mzFlag: $("#mzFlag").val(),
+            jcDialog: $("#jcDialog").val(),
             execAddress:$("#execAddress").val(),
             genderRestriction:$("#genderRestriction").val(),
             minAgeRestriction:$("#minAgeRestriction").val(),
@@ -185,6 +186,7 @@ function saveJcZdItem() {
             delFlag: $("#delFlag").val(),
             zyFlag: $("#zyFlag").val(),
             mzFlag: $("#mzFlag").val(),
+            jcDialog: $("#jcDialog").val(),
             execAddress:$("#execAddress").val(),
             genderRestriction:$("#genderRestriction").val(),
             minAgeRestriction:$("#minAgeRestriction").val(),
@@ -320,6 +322,7 @@ function saveJyZdItem() {
             delFlag: $("#delFlagJy").val(),
             zyFlag: $("#zyFlagJy").val(),
             mzFlag: $("#mzFlagJy").val(),
+            jyDialog: $("#jyDialog").val(),
             execAddress:$("#jyExecAddress").val(),
             genderRestriction:$("#genderRestrictionJy").val(),
             minAgeRestriction:$("#minAgeRestrictionJy").val(),
@@ -337,6 +340,7 @@ function saveJyZdItem() {
             delFlag: $("#delFlagJy").val(),
             zyFlag: $("#zyFlagJy").val(),
             mzFlag: $("#mzFlagJy").val(),
+            jyDialog: $("#jyDialog").val(),
             execAddress:$("#jyExecAddress").val(),
             genderRestriction:$("#genderRestrictionJy").val(),
             minAgeRestriction:$("#minAgeRestrictionJy").val(),
@@ -388,6 +392,8 @@ function clearJcInput() {
     $("#zyFlag").selectpicker('refresh');
     $("#mzFlag").selectpicker('val', 0);//默认不选中
     $("#mzFlag").selectpicker('refresh');
+    $("#jcDialog").selectpicker('val', 0);//默认不选中
+    $("#jcDialog").selectpicker('refresh');
     $("#execAddress").val(null);
     $("#genderRestriction").selectpicker('val', '');//默认不选中
     $("#genderRestriction").selectpicker('refresh');
@@ -446,6 +452,8 @@ function clearJyInput() {
     $("#zyFlagJy").selectpicker('refresh');
     $("#mzFlagJy").selectpicker('val', 0);//默认不选中
     $("#mzFlagJy").selectpicker('refresh');
+    $("#jyDialog").selectpicker('val', 0);//默认不选中
+    $("#jyDialog").selectpicker('refresh');
     $("#jyExecAddress").val(null);
     $("#genderRestrictionJy").selectpicker('val', '');//默认不选中
     $("#genderRestrictionJy").selectpicker('refresh');
@@ -1118,6 +1126,7 @@ function editJcZdItem(code) {
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
+            console.log(res);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -1137,6 +1146,8 @@ function editJcZdItem(code) {
                 $("#zyFlag").selectpicker('refresh');
                 $("#mzFlag").selectpicker('val', res.data.mzFlag);//默认不选中
                 $("#mzFlag").selectpicker('refresh');
+                $("#jcDialog").selectpicker('val', res.data.jcDialog);//默认不选中
+                $("#jcDialog").selectpicker('refresh');
                 $("#execAddress").val(res.data.execAddress);
                 $("#genderRestriction").selectpicker('val', res.data.genderRestriction);//默认不选中
                 $("#genderRestriction").selectpicker('refresh');
@@ -1164,6 +1175,7 @@ function editJyZdItem(code) {
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
+            console.log(res);
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
                 return;
@@ -1185,6 +1197,8 @@ function editJyZdItem(code) {
                 $("#zyFlagJy").selectpicker('refresh');
                 $("#mzFlagJy").selectpicker('val', res.data.mzFlag);//默认不选中
                 $("#mzFlagJy").selectpicker('refresh');
+                $("#jyDialog").selectpicker('val', res.data.jyDialog);//默认不选中
+                $("#jyDialog").selectpicker('refresh');
                 $("#jyExecAddress").val(res.data.execAddress);
                 $("#genderRestrictionJy").selectpicker('val', res.data.genderRestriction);//默认不选中
                 $("#genderRestrictionJy").selectpicker('refresh');
@@ -1442,6 +1456,10 @@ function initSelect() {
     $('#mzFlag').selectpicker('refresh');
     $("#mzFlag").selectpicker('val', 0);
     $("#mzFlag").selectpicker('refresh');
+    $('#jcDialog').html(yesNo);
+    $('#jcDialog').selectpicker('refresh');
+    $("#jcDialog").selectpicker('val', 0);
+    $("#jcDialog").selectpicker('refresh');
     $('#zyFlagJcCharge').html(yesNo);
     $('#zyFlagJcCharge').selectpicker('refresh');
     $("#zyFlagJcCharge").selectpicker('val', 0);
@@ -1467,6 +1485,10 @@ function initSelect() {
     $('#mzFlagJy').selectpicker('refresh');
     $("#mzFlagJy").selectpicker('val', 0);
     $("#mzFlagJy").selectpicker('refresh');
+    $('#jyDialog').html(yesNo);
+    $('#jyDialog').selectpicker('refresh');
+    $("#jyDialog").selectpicker('val', 0);
+    $("#jyDialog").selectpicker('refresh');
     $('#zyFlagJyCharge').html(yesNo);
     $('#zyFlagJyCharge').selectpicker('refresh');
     $("#zyFlagJyCharge").selectpicker('val', 0);

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

@@ -164,6 +164,14 @@
                                     title="请选择"></select>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="jcDialog">支付弹窗
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <select class="form-control selectpicker show-tick" id="jcDialog"
+                                    title="请选择"></select>
+                        </div>
+                    </div>
                     <div class="item form-group thmz_alert">
                         <label class="control-label col-md-2 col-sm-2 col-xs-12" for="execAddress">执行地点
                         </label>
@@ -295,6 +303,14 @@
                                     title="请选择"></select>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <label class="control-label col-md-2 col-sm-2 col-xs-12" for="jyDialog">支付弹窗
+                        </label>
+                        <div class="col-md-10 col-sm-10 col-xs-12">
+                            <select class="form-control selectpicker show-tick" id="jyDialog"
+                                    title="请选择"></select>
+                        </div>
+                    </div>
                     <div class="item form-group thmz_alert">
                         <label class="control-label col-md-2 col-sm-2 col-xs-12" for="jyExecAddress">执行地点
                         </label>