Explorar o código

更新收费字典和延时启用停用

hurugang %!s(int64=3) %!d(string=hai) anos
pai
achega
1a12772ecd

+ 15 - 4
src/main/java/cn/hnthyy/thmz/controller/mz/ZdChargeItemController.java

@@ -142,15 +142,17 @@ public class ZdChargeItemController {
     }
 
 
-
     /**
      * 停用或者启用收费项目字典
-     *
+     * @param code 项目编码
+     * @param delFlag 0 启用   1 停用
+     * @param effectiveDate 如果生效时间不为空,说明是延时修改 ,反之 实时修改
+     * @param httpServletRequest
      * @return
      */
     @UserLoginToken
     @RequestMapping(value = "/updateZdChargeItemDelFlag", method = {RequestMethod.GET})
-    public Map<String, Object> updateZdChargeItemDelFlag(@RequestParam("code") String code,@RequestParam("delFlag") Integer delFlag, HttpServletRequest httpServletRequest) {
+    public Map<String, Object> updateZdChargeItemDelFlag(@RequestParam("code") String code,@RequestParam("delFlag") Integer delFlag,@RequestParam("effectiveDate") String effectiveDate, HttpServletRequest httpServletRequest) {
         Map<String, Object> resultMap = new HashMap<>();
         if(StringUtils.isBlank(code)){
             resultMap.put("code", -1);
@@ -183,10 +185,19 @@ public class ZdChargeItemController {
             }
         }
         String str = YesNoEnum.YES.code.equals(delFlag)?"停用":"启用";
+        Date effectiveDateD=null;
+        if(StringUtils.isNotBlank(effectiveDate)&& !"null".equals(effectiveDate)){
+            effectiveDateD=DateUtil.getFirstSecond(DateUtil.pase(effectiveDate, "yyyy-MM-dd"));
+            str = YesNoEnum.YES.code.equals(delFlag)?"延时停用":"延时启用";
+        }
         try {
             ZdChargeItem zdChargeItem = new ZdChargeItem();
             zdChargeItem.setCode(code);
-            zdChargeItem.setDelFlag(delFlag);
+            if(effectiveDateD==null){
+                zdChargeItem.setDelFlag(delFlag);
+            }else {
+                zdChargeItem.setEffectiveDate(effectiveDateD);
+            }
             User tokenUser = TokenUtil.getUser(httpServletRequest);
             zdChargeItem.setOperId(tokenUser.getUserIdCode());
             int num=zdChargeItemService.modifyZdChargeItem(zdChargeItem);

+ 5 - 1
src/main/java/cn/hnthyy/thmz/entity/his/zd/ZdChargeItem.java

@@ -22,7 +22,7 @@ public class ZdChargeItem {
     private String auditCode;
     //收费金额
     private BigDecimal chargeAmount;
-    //生效时间
+    //生效时间  用做延时启用和延时停用的时间
     private Date effectiveDate;
     //生效金额
     private BigDecimal effectiveAmount;
@@ -124,6 +124,10 @@ public class ZdChargeItem {
     private String updateId;
     //修改时间
     private Date updateTime;
+    //国家耗材代码
+    private String nationalCode;
+    //医保通用名称
+    private String nationalName;
     //使用数量 非数据库字段
     private BigDecimal num;
     //收费总金额 非数据库字段

+ 15 - 7
src/main/java/cn/hnthyy/thmz/mapper/his/zd/ZdChargeItemMapper.java

@@ -24,7 +24,7 @@ public interface ZdChargeItemMapper {
                     "            rtrim(self_flag) self_flag,rtrim(separate_flag) separate_flag,rtrim(suppress_flag) suppress_flag,py_code,d_code wb_code,bill_item_zy,bill_item_mz," +
                     "            charge_unit,percent_group_zy,percent_group_mz,rtrim(case  when in_out_flag ='' then null else in_out_flag end) in_out_flag,n_code yn_code,class_code,s_code bz_code,discription,rtrim(del_flag) del_flag," +
                     "            rtrim(yp_flag) yp_flag,bill_item_code,rtrim(xnh_flag) xnh_flag,add_date,hnsyb_code,hnsyb_name,xnh_code,xnh_name,xnh_ratio,xnh_quotamoney,rtrim(xnh_status) xnh_status," +
-                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code,effective_time,effective_price,update_id,update_time " +
+                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code,effective_time,effective_price,update_id,update_time,national_code,national_name " +
                     " FROM (SELECT ROW_NUMBER() OVER (ORDER BY zd_charge_item_page.add_date desc) ",
             "AS RowNumber,* from dbo.zd_charge_item zd_charge_item_page WITH(NOLOCK)  where 1=1 ",
             "<when test='zdChargeItem.delFlag!=null'>",
@@ -102,7 +102,7 @@ public interface ZdChargeItemMapper {
             "rtrim(self_flag) self_flag,rtrim(separate_flag) separate_flag,rtrim(suppress_flag) suppress_flag,py_code,d_code wb_code,bill_item_zy,bill_item_mz," +
             "charge_unit,percent_group_zy,percent_group_mz,rtrim(case  when in_out_flag ='' then null else in_out_flag end) in_out_flag,n_code yn_code,class_code,s_code bz_code,discription,rtrim(del_flag) del_flag, " +
             "rtrim(yp_flag) yp_flag,bill_item_code,rtrim(xnh_flag) xnh_flag,add_date,hnsyb_code,hnsyb_name,xnh_code,xnh_name,xnh_ratio,xnh_quotamoney,rtrim(xnh_status) xnh_status," +
-            "yb_flag_new,yb_comment_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,yb_bl_new,e_code yb_code,cl_code,co,xl_code,effective_time,effective_price,update_id,update_time " +
+            "yb_flag_new,yb_comment_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,yb_bl_new,e_code yb_code,cl_code,co,xl_code,effective_time,effective_price,update_id,update_time,national_code,national_name " +
             " from zd_charge_item  WITH(NOLOCK)  where  code = #{code,jdbcType=VARCHAR} ")
     //     " and (del_flag != 1 or del_flag is null) " )
     ZdChargeItem selectZdChargeItemByCode(@Param("code") String code);
@@ -120,7 +120,7 @@ public interface ZdChargeItemMapper {
             "charge_unit,percent_group_zy,percent_group_mz,rtrim(case  when in_out_flag ='' then null else in_out_flag end) in_out_flag,n_code yn_code,class_code,s_code bz_code,discription,rtrim(del_flag) del_flag, ",
             "rtrim(yp_flag) yp_flag,bill_item_code,rtrim(xnh_flag) xnh_flag,add_date,hnsyb_code,hnsyb_name,xnh_code,xnh_name,xnh_ratio,xnh_quotamoney,rtrim(xnh_status) xnh_status,",
             // "yb_flag_new,yb_comment_new,yb_bl_new from zd_charge_item where (del_flag != 1 or del_flag is null) ",
-            "yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,e_code yb_code,cl_code,co,xl_code,effective_time,effective_price,update_id,update_time " +
+            "yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,e_code yb_code,cl_code,co,xl_code,effective_time,effective_price,update_id,update_time,national_code,national_name " +
                     " from zd_charge_item WITH(NOLOCK)  ",
             "<when test='codes!=null'>",
             " where code in",
@@ -149,10 +149,10 @@ public interface ZdChargeItemMapper {
      */
     @Insert("INSERT INTO zd_charge_item ( code, name, charge_amount, percentag1, percentag2, percentag3, percentag4, percentag5, self_flag, separate_flag," +
             " suppress_flag, py_code, d_code, del_flag, charge_unit, percent_group_mz, class_code, e_code, s_code, add_date, xnh_code, xnh_name,audit_code," +
-            "bill_item_mz,bill_item_zy,exec_unit,discription,cl_code,co,oper_id,xl_code,yb_comment ) VALUES (" +
+            "bill_item_mz,bill_item_zy,exec_unit,discription,cl_code,co,oper_id,xl_code,yb_comment,national_code,national_name ) VALUES (" +
             " #{code}, #{name}, #{chargeAmount}, #{percentag1}, #{percentag2}, #{percentag3}, #{percentag4}, #{percentag5}, #{selfFlag}, #{separateFlag}, " +
             "#{suppressFlag}, #{pyCode}, #{wbCode}, #{delFlag}, #{chargeUnit}, #{percentGroupMz}, #{classCode}, #{ybCode}, #{bzCode}, #{addDate}, #{xnhCode}, #{xnhName}" +
-            ",#{auditCode},#{billItemMz},#{billItemZy},#{execUnit} ,#{discription}, #{clCode},#{co},#{operId},#{xlCode},#{ybComment}  )")
+            ",#{auditCode},#{billItemMz},#{billItemZy},#{execUnit} ,#{discription}, #{clCode},#{co},#{operId},#{xlCode},#{ybComment},#{nationalCode},#{nationalName}  )")
     int insertZdChargeItem(ZdChargeItem zdChargeItem);
 
 
@@ -255,6 +255,12 @@ public interface ZdChargeItemMapper {
             "<when test='updateTime!=null'>",
             ",update_time =#{updateTime}",
             "</when>",
+            "<when test='nationalCode!=null'>",
+            ",national_code =#{nationalCode}",
+            "</when>",
+            "<when test='nationalName!=null'>",
+            ",national_name =#{nationalName}",
+            "</when>",
             "</trim>",
             "</script>"})
     int updateZdChargeItem(ZdChargeItem zdChargeItem);
@@ -270,7 +276,8 @@ public interface ZdChargeItemMapper {
                     "            rtrim(self_flag) self_flag,rtrim(separate_flag) separate_flag,rtrim(suppress_flag) suppress_flag,py_code,d_code wb_code,bill_item_zy,bill_item_mz," +
                     "            charge_unit,percent_group_zy,percent_group_mz,rtrim(case  when in_out_flag ='' then null else in_out_flag end) in_out_flag,n_code yn_code,class_code,s_code bz_code,discription,rtrim(del_flag) del_flag," +
                     "            rtrim(yp_flag) yp_flag,bill_item_code,rtrim(xnh_flag) xnh_flag,add_date,hnsyb_code,hnsyb_name,xnh_code,xnh_name,xnh_ratio,xnh_quotamoney,rtrim(xnh_status) xnh_status," +
-                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code,effective_time,effective_price,update_id,update_time FROM zd_charge_item WITH(NOLOCK)  ",
+                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code," +
+                    "effective_time,effective_price,update_id,update_time,national_code,national_name FROM zd_charge_item WITH(NOLOCK)  ",
             " where del_flag =0 ",
             "</script>"})
     List<ZdChargeItem> selectAllInUsedZdCharge();
@@ -286,7 +293,8 @@ public interface ZdChargeItemMapper {
                     "            rtrim(self_flag) self_flag,rtrim(separate_flag) separate_flag,rtrim(suppress_flag) suppress_flag,py_code,d_code wb_code,bill_item_zy,bill_item_mz," +
                     "            charge_unit,percent_group_zy,percent_group_mz,rtrim(case  when in_out_flag ='' then null else in_out_flag end) in_out_flag,n_code yn_code,class_code,s_code bz_code,discription,rtrim(del_flag) del_flag," +
                     "            rtrim(yp_flag) yp_flag,bill_item_code,rtrim(xnh_flag) xnh_flag,add_date,hnsyb_code,hnsyb_name,xnh_code,xnh_name,xnh_ratio,xnh_quotamoney,rtrim(xnh_status) xnh_status," +
-                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code,effective_time,effective_price,update_id,update_time FROM zd_charge_item WITH(NOLOCK)  ",
+                    "            yb_flag_new,yb_comment_new,yb_bl_new,charge_amount_lwg,percent_group_1  percent_group1,yb_name,yb_comment,cl_code,e_code yb_code,co,xl_code,effective_time," +
+                    "effective_price,update_id,update_time,national_code,national_name FROM zd_charge_item WITH(NOLOCK)  ",
             "</script>"})
     List<ZdChargeItem> selectAllZdCharge();
 

+ 164 - 67
src/main/resources/static/js/mz/charge_detail.js

@@ -53,6 +53,107 @@ $(function () {
         }
     });
 
+
+
+
+
+//保存收费项目
+    $('#save').click(function () {
+        $.ajax({
+            type: "POST",
+            url: '/thmz/saveZdChargeItem',
+            contentType: "application/json;charset=UTF-8",
+            dataType: "json",
+            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+            data: JSON.stringify({"classCode": $("#classCodeParams").val(),
+                // "ybCode": $("#ybCodeParmas").val(),"xnhCode": $("#xnhCodeParams").val(),
+                // "xnhName": $("#xnhNameParams").val(),
+                "name": $("#namePamras").val(),"chargeUnit": $("#chargeUnitParams").val(),
+                "chargeAmount": $("#chargeAmountParams").val(),
+                //"percentag1": $("#percentag1Params").val(),
+                "percentag2": $("#percentag2Params").val(),
+                // "percentag3": $("#percentag3Params").val(),"percentag4": $("#percentag4Params").val(),"percentag5": $("#percentag5Params").val(),
+                "auditCode": $("#auditCodeParams").val(),"billItemMz": $("#billItemMzParams").val(),
+                "billItemZy": $("#billItemZyParams").val(),"execUnit": $("#execUnitParams").val(),"bzCode": $("#bzCodeParams").val(),
+                "discription": $("#discriptionParams").val(),"clCode": $("#clCodeParams").val(),"co": $("#coParams").val(),"xlCode": $("#xlCodeParams").val(),
+                "code": $("#code").val(),"ybComment": $("#ybCommentParams").val(),"nationalCode": $("#nationalCodeParams").val(),"nationalName": $("#nationalNameParams").val()}),
+            success: function (res) {
+                if (res == '401' || res == 401) {
+                    window.location.href = '/thmz/login/view'
+                    return;
+                }
+                if (res.code == 0) {
+                    $("#chargeDetailModal").modal("hide");
+                    clearInput();
+                    successMesage(res);
+                    $('#tb_table').bootstrapTable("refresh");
+                } else {
+                    errorMesage(res);
+                }
+            }
+        });
+    });
+
+
+//保存收费项目延迟改价
+    $('#save_price').click(function () {
+        $.ajax({
+            type: "POST",
+            url: '/thmz/saveEffectivePrice',
+            contentType: "application/json;charset=UTF-8",
+            dataType: "json",
+            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+            data: JSON.stringify({
+                "effectivePrice": $("#chargeAmountPriceNeedUpdateParams").val(),
+                "effectiveTime": $("#effectiveTimeParams").val(),
+                "code": $("#code_price").val()
+            }),
+            success: function (res) {
+                if (res == '401' || res == 401) {
+                    window.location.href = '/thmz/login/view'
+                    return;
+                }
+                if (res.code == 0) {
+                    $("#priceModal").modal("hide");
+                    clearPriceInput();
+                    successMesage(res);
+                } else {
+                    errorMesage(res);
+                }
+            }
+        });
+    });
+
+
+    //保存收费项目延迟启用/停用
+    $('#save_delayToEnableOrStop').click(function () {
+       var delayToEnableOrStop= $("#delayToEnableOrStop").val();
+       var name= $("#nameDelayToEnableOrStopParams").val();
+        if (delayToEnableOrStop == 1 && !confirm("确认要停用项目【"+name+"】信息吗?")) {
+            return;
+        }
+        $.ajax({
+            type: "GET",
+            url: '/thmz/updateZdChargeItemDelFlag?code=' + $("#code_delayToEnableOrStopParams").val() + "&delFlag=" + delayToEnableOrStop+"&effectiveDate="+$("#effectiveTimeDelayToEnableOrStopParams").val(),
+            dataType: "json",
+            headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+            success: function (res) {
+                if (res == '401' || res == 401) {
+                    window.location.href = '/thmz/login/view'
+                    return;
+                }
+                if (res.code == 0) {
+                    $("#delayToEnableOrStopModal").modal("hide");
+                    clearDelayToEnableOrStopInput();
+                    successMesage(res);
+                } else {
+                    errorMesage(res);
+                }
+            }
+        });
+    });
+
+
 });
 
 /**
@@ -102,8 +203,10 @@ function initZdChargeItemList() {
                     str += '<button type="button" class="btn btn-primary  btn-sm" onclick="updateZdChargeItemPrice(\'' + row.code + '\')">延时调价</button>';
                     if (row.delFlag == 0) {
                         str += '<button type="button" class="btn btn-warning  btn-sm" onclick="updateZdChargeItemDelFlag(\'' + row.code + '\',\'' + row.name + '\',1)">停用</button>';
+                        str += '<button type="button" class="btn btn-warning  btn-sm" onclick="delayStopOrToEnable(\'' + row.code + '\',1)">延时停用</button>';
                     } else if (row.delFlag == 1) {
                         str += '<button type="button" class="btn btn-success  btn-sm" onclick="updateZdChargeItemDelFlag(\'' + row.code + '\',\'' + row.name + '\',0)">启用</button>';
+                        str += '<button type="button" class="btn btn-success  btn-sm" onclick="delayStopOrToEnable(\'' + row.code + '\',0)">延时启用</button>';
                     }
                     return [str].join('');
                 }
@@ -311,6 +414,16 @@ function initZdChargeItemList() {
                     }
                     return format(value, "yyyy-MM-dd HH:mm:ss");
                 }
+            }, {
+                field: 'nationalCode',
+                title: '国家耗材代码',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'nationalName',
+                title: '医保通用名称',
+                align: "center",
+                valign: 'middle'
             }, {
                 field: 'ybComment',
                 title: '生产厂家',
@@ -537,7 +650,7 @@ function updateZdChargeItemDelFlag(code, name,delFlag) {
     }
     $.ajax({
         type: "GET",
-        url: '/thmz/updateZdChargeItemDelFlag?code=' + code + "&delFlag=" + delFlag,
+        url: '/thmz/updateZdChargeItemDelFlag?code=' + code + "&delFlag=" + delFlag+"&effectiveDate=null",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
@@ -599,6 +712,8 @@ function updateZdChargeItem(code) {
                 $("#discriptionParams").val(res.data.discription);
                 $("#ybCommentParams").val(res.data.ybComment);
                 $("#clCodeParams").val(res.data.clCode);
+                $("#nationalCodeParams").val(res.data.nationalCode);
+                $("#nationalNameParams").val(res.data.nationalName);
                 $('#coParams').selectpicker('val', res.data.co);
                 if(res.data.co==null || res.data.co==""){
                     $('#coParams').selectpicker('val', 0);
@@ -617,6 +732,41 @@ function updateZdChargeItem(code) {
     });
 }
 
+/**
+ * 收费项目延时启用/收费项目延时停用
+ * @param code
+ * @param delFlag 1 停用  0 启用
+ */
+function delayStopOrToEnable(code,delFlag) {
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getZdChargeItemByCode?code=' + code,
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                $("#delayToEnableOrStop").val(delFlag);
+                if(delFlag==0){
+                    $("#delayToEnableOrStopTitle").html("延时启用收费项目");
+                }else if(delFlag==1){
+                    $("#delayToEnableOrStopTitle").html("延时停用收费项目");
+                }
+                $("#nameDelayToEnableOrStopParams").val(res.data.name);
+                $("#code_delayToEnableOrStopParams").val(res.data.code);
+                if(res.data.effectiveDate!=null){
+                    $("#effectiveTimeDelayToEnableOrStopParams").val(format(res.data.effectiveDate, "yyyy-MM-dd"));
+                }
+                $("#delayToEnableOrStopModal").modal();
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}
 
 
 /**
@@ -688,72 +838,6 @@ function initDeptSelect() {
 
 
 
-//保存收费项目
-$('#save').click(function () {
-    $.ajax({
-        type: "POST",
-        url: '/thmz/saveZdChargeItem',
-        contentType: "application/json;charset=UTF-8",
-        dataType: "json",
-        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
-        data: JSON.stringify({"classCode": $("#classCodeParams").val(),
-            // "ybCode": $("#ybCodeParmas").val(),"xnhCode": $("#xnhCodeParams").val(),
-            // "xnhName": $("#xnhNameParams").val(),
-            "name": $("#namePamras").val(),"chargeUnit": $("#chargeUnitParams").val(),
-            "chargeAmount": $("#chargeAmountParams").val(),
-            //"percentag1": $("#percentag1Params").val(),
-             "percentag2": $("#percentag2Params").val(),
-            // "percentag3": $("#percentag3Params").val(),"percentag4": $("#percentag4Params").val(),"percentag5": $("#percentag5Params").val(),
-            "auditCode": $("#auditCodeParams").val(),"billItemMz": $("#billItemMzParams").val(),
-            "billItemZy": $("#billItemZyParams").val(),"execUnit": $("#execUnitParams").val(),"bzCode": $("#bzCodeParams").val(),
-            "discription": $("#discriptionParams").val(),"clCode": $("#clCodeParams").val(),"co": $("#coParams").val(),"xlCode": $("#xlCodeParams").val(),
-            "code": $("#code").val(),"ybComment": $("#ybCommentParams").val()}),
-        success: function (res) {
-            if (res == '401' || res == 401) {
-                window.location.href = '/thmz/login/view'
-                return;
-            }
-            if (res.code == 0) {
-                $("#chargeDetailModal").modal("hide");
-                clearInput();
-                successMesage(res);
-                $('#tb_table').bootstrapTable("refresh");
-            } else {
-                errorMesage(res);
-            }
-        }
-    });
-});
-
-
-
-//保存收费项目延迟改价
-$('#save_price').click(function () {
-    $.ajax({
-        type: "POST",
-        url: '/thmz/saveEffectivePrice',
-        contentType: "application/json;charset=UTF-8",
-        dataType: "json",
-        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
-        data: JSON.stringify({
-            "effectivePrice": $("#chargeAmountPriceNeedUpdateParams").val(),"effectiveTime": $("#effectiveTimeParams").val(),
-            "code": $("#code_price").val()}),
-        success: function (res) {
-            if (res == '401' || res == 401) {
-                window.location.href = '/thmz/login/view'
-                return;
-            }
-            if (res.code == 0) {
-                $("#priceModal").modal("hide");
-                clearPriceInput();
-                successMesage(res);
-            } else {
-                errorMesage(res);
-            }
-        }
-    });
-});
-
 
 
 /**
@@ -778,6 +862,8 @@ function clearInput() {
     $("#discriptionParams").val(null);
     $("#ybCommentParams").val(null);
     $("#clCodeParams").val(null);
+    $("#nationalCodeParams").val(null);
+    $("#nationalNameParams").val(null);
     $('#coParams').selectpicker('val', 0);
     $('#coParams').selectpicker('refresh');
     $("#xlCodeParams").val(null);
@@ -796,6 +882,17 @@ function clearPriceInput() {
     $("#code_price").val(null);
 }
 
+
+/**
+ * 清空输入框
+ */
+function clearDelayToEnableOrStopInput() {
+    $("#nameDelayToEnableOrStopParams").val(null);
+    $("#effectiveTimeDelayToEnableOrStopParams").val(null);
+    $("#code_delayToEnableOrStopParams").val(null);
+    $("#delayToEnableOrStop").val(null);
+}
+
 /**
  * 加价率改变事件
  */

+ 59 - 2
src/main/resources/templates/mz/charge_detail.html

@@ -298,6 +298,22 @@
                                            class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
+                            <div class="item form-group">
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="nationalCodeParams">国家耗材代码
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="nationalCodeParams"
+                                           class="form-control col-md-7 col-xs-12">
+                                </div>
+                            </div>
+                            <div class="item form-group">
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="nationalNameParams">医保通用名称
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="nationalNameParams"
+                                           class="form-control col-md-7 col-xs-12">
+                                </div>
+                            </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="ybCommentParams">生产厂家
                                 </label>
@@ -334,7 +350,7 @@
 
 
 
-
+       <!-- 延时调价开始-->
         <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="priceModal">
             <div class="modal-dialog modal-lg">
                 <div class="modal-content">
@@ -390,10 +406,51 @@
                 </div>
             </div>
         </div>
+        <!-- 延时调价结束-->
 
 
+        <!-- 延时启用/停用开始-->
+        <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="delayToEnableOrStopModal">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
 
-
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" onclick="clearDelayToEnableOrStopInput()"><span aria-hidden="true">×</span>
+                        </button>
+                        <h4 class="modal-title modal-title-thmz" id="delayToEnableOrStopTitle">延时启用收费项目</h4>
+                    </div>
+                    <div class="modal-body">
+                        <form class="form-horizontal form-label-left" novalidate >
+                            <div class="item form-group">
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="nameDelayToEnableOrStopParams">项目名称
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="nameDelayToEnableOrStopParams" data-validate-length-range="1,20"
+                                           class="form-control col-md-7 col-xs-12" readonly>
+                                </div>
+                            </div>
+                            <div class="item form-group">
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="effectiveTimeDelayToEnableOrStopParams">生效时间 <span
+                                        class="required">*</span>
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="effectiveTimeDelayToEnableOrStopParams"
+                                           class="form-control col-md-7 col-xs-12">
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <input type="hidden" id="code_delayToEnableOrStopParams"/>
+                        <!--1 停用  0 启用-->
+                        <input type="hidden" id="delayToEnableOrStop"/>
+                        <button type="button" class="btn btn-primary" id="save_delayToEnableOrStop">保存</button>
+                        <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearDelayToEnableOrStopInput()">取消</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 延时启用/停用结束-->
 
 
         <!--&lt;!&ndash; 信息删除确认 &ndash;&gt;-->