收费项目明细是否收费功能

src/main/java/cn/hnthyy/thmz/controller/ZdChargeItemController.java

@@ -261,6 +261,11 @@ public class ZdChargeItemController {
 //                resultMap.put("message", "生效时间不能为空");
 //                return resultMap;
 //            }
+            if(zdChargeItem.getCo()==null){
+                resultMap.put("code", -1);
+                resultMap.put("message", "是否加价不能为空");
+                return resultMap;
+            }
             if(StringUtils.isBlank(zdChargeItem.getAuditCode())){
                 resultMap.put("code", -1);
                 resultMap.put("message", "核算码不能为空");

src/main/java/cn/hnthyy/thmz/mapper/his/ZdChargeItemMapper.java

@@ -23,7 +23,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(in_out_flag) 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 FROM (SELECT ROW_NUMBER() OVER (ORDER BY zd_charge_item_page.add_date desc) ",
+                    "            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 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 where 1=1 ",
             "<when test='zdChargeItem.delFlag!=null'>",
             " and del_flag =#{zdChargeItem.delFlag}",
@@ -100,7 +100,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(in_out_flag) 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,e_code yb_code,cl_code from zd_charge_item where  code = #{code,jdbcType=VARCHAR} ")
+            "yb_flag_new,yb_comment_new,yb_bl_new,e_code yb_code,cl_code,co from zd_charge_item where  code = #{code,jdbcType=VARCHAR} ")
        //     " and (del_flag != 1 or del_flag is null) " )
     ZdChargeItem selectZdChargeItemByCode(@Param("code") String code);
 
@@ -118,7 +118,7 @@ public interface ZdChargeItemMapper {
             "charge_unit,percent_group_zy,percent_group_mz,rtrim(in_out_flag) 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,e_code yb_code,cl_code from zd_charge_item  ",
+            "yb_flag_new,yb_comment_new,yb_bl_new,e_code yb_code,cl_code,co from zd_charge_item  ",
             "<when test='codes!=null'>",
             " where code in",
             "<foreach item='item' index='index' collection='codes' open='(' separator=',' close=')'>",

src/main/resources/static/js/charge_detail.js

@@ -276,6 +276,20 @@ function initZdChargeItemList() {
             //     align: "center",
             //     valign: 'middle'
             // }
+            , {
+                field: 'co',
+                title: '是否加价',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    if (value == 0) {
+                        return "否";
+                    }
+                    if (value == 1) {
+                        return "是";
+                    }
+                }
+            }
             , {
                 field: 'execUnitName',
                 title: '执行科室',
@@ -625,6 +639,8 @@ function updateZdChargeItem(code) {
                 $("#bzCodeParams").val(res.data.bzCode);
                 $("#discriptionParams").val(res.data.discription);
                 $("#clCodeParams").val(res.data.clCode);
+                $('#coParams').selectpicker('val', res.data.co);
+                $('#coParams').selectpicker('refresh');
                 $("#code").val(res.data.code);
                 $("div.bs-example-modal-lg").modal();
             } else {
@@ -684,7 +700,7 @@ $('#save').click(function () {
             "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(),"code": $("#code").val()}),
+            "discription": $("#discriptionParams").val(),"clCode": $("#clCodeParams").val(),"co": $("#coParams").val(),"code": $("#code").val()}),
         success: function (res) {
             if (res == '401' || res == 401) {
                 window.location.href = '/thmz/login/view'
@@ -732,5 +748,7 @@ function clearInput() {
     $("#bzCodeParams").val(null);
     $("#discriptionParams").val(null);
     $("#clCodeParams").val(null);
+    $('#coParams').selectpicker('val', 0);
+    $('#coParams').selectpicker('refresh');
     $("#code").val(null);
 }