增加项目字典字段

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

@@ -134,5 +134,11 @@ public class ZdChargeItem {
     private BigDecimal totalAmount;
     //套餐编码非数据库字段
     private String tcCode;
+    //规格
+    private String  descriptions;
+    //除外内容
+    private String  excludeContent;
+    //项目内涵
+    private String  connotation;
 
 }

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,national_code,national_name " +
+                    "            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,descriptions,exclude_content,connotation " +
                     " 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,national_code,national_name " +
+            "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,descriptions,exclude_content,connotation " +
             " 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,national_code,national_name " +
+            "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,descriptions,exclude_content,connotation " +
                     " 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,national_code,national_name ) VALUES (" +
+            "bill_item_mz,bill_item_zy,exec_unit,discription,cl_code,co,oper_id,xl_code,yb_comment,national_code,national_name,descriptions,exclude_content,connotation ) 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},#{nationalCode},#{nationalName}  )")
+            ",#{auditCode},#{billItemMz},#{billItemZy},#{execUnit} ,#{discription}, #{clCode},#{co},#{operId},#{xlCode},#{ybComment},#{nationalCode},#{nationalName},#{descriptions},#{excludeContent},#{connotation}  )")
     int insertZdChargeItem(ZdChargeItem zdChargeItem);
 
 
@@ -267,6 +267,15 @@ public interface ZdChargeItemMapper {
             "<when test='nationalName!=null'>",
             ",national_name =#{nationalName}",
             "</when>",
+            "<when test='descriptions!=null'>",
+            ",descriptions  =#{descriptions}",
+            "</when>",
+            "<when test='excludeContent!=null'>",
+            ",exclude_content =#{excludeContent}",
+            "</when>",
+            "<when test='connotation!=null'>",
+            ",connotation =#{connotation}",
+            "</when>",
             "</trim>",
             "</script>"})
     int updateZdChargeItem(ZdChargeItem zdChargeItem);
@@ -283,7 +292,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,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)  ",
+                    "effective_time,effective_price,update_id,update_time,national_code,national_name,descriptions,exclude_content,connotation FROM zd_charge_item WITH(NOLOCK)  ",
             " where del_flag =0 ",
             "</script>"})
     List<ZdChargeItem> selectAllInUsedZdCharge();
@@ -300,7 +309,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,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)  ",
+                    "effective_price,update_id,update_time,national_code,national_name,descriptions,exclude_content,connotation FROM zd_charge_item WITH(NOLOCK)  ",
             "</script>"})
     List<ZdChargeItem> selectAllZdCharge();
 

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

@@ -76,7 +76,8 @@ $(function () {
                 "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()}),
+                "code": $("#code").val(),"ybComment": $("#ybCommentParams").val(),"nationalCode": $("#nationalCodeParams").val(),"nationalName": $("#nationalNameParams").val(),
+                "descriptions": $("#descriptionsParams").val(),"excludeContent": $("#excludeContentParams").val(),"connotation": $("#connotationParams").val()}),
             success: function (res) {
                 if (res == '401' || res == 401) {
                     window.location.href = '/thmz/login/view'
@@ -410,7 +411,7 @@ function initZdChargeItemList() {
                 valign: 'middle'
             }, {
                 field: 'discription',
-                title: '项目内涵',
+                title: '项目描述',
                 align: "center",
                 valign: 'middle'
             }
@@ -445,6 +446,21 @@ function initZdChargeItemList() {
                 title: '耗材院内编码',
                 align: "center",
                 valign: 'middle'
+            }, {
+                field: 'descriptions',
+                title: '规格',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'excludeContent',
+                title: '除外内容',
+                align: "center",
+                valign: 'middle'
+            }, {
+                field: 'connotation',
+                title: '项目内涵',
+                align: "center",
+                valign: 'middle'
             }
         ],
         responseHandler: function (res) {
@@ -762,6 +778,9 @@ function updateZdChargeItem(code) {
                 $("#clCodeParams").val(res.data.clCode);
                 $("#nationalCodeParams").val(res.data.nationalCode);
                 $("#nationalNameParams").val(res.data.nationalName);
+                $("#descriptionsParams").val(res.data.descriptions);
+                $("#excludeContentParams").val(res.data.excludeContent);
+                $("#connotationParams").val(res.data.connotation);
                 $('#coParams').selectpicker('val', res.data.co);
                 if(res.data.co==null || res.data.co==""){
                     $('#coParams').selectpicker('val', 0);
@@ -912,6 +931,11 @@ function clearInput() {
     $("#clCodeParams").val(null);
     $("#nationalCodeParams").val(null);
     $("#nationalNameParams").val(null);
+
+    $("#descriptionsParams").val(null);
+    $("#excludeContentParams").val(null);
+    $("#connotationParams").val(null);
+
     $('#coParams').selectpicker('val', 0);
     $('#coParams').selectpicker('refresh');
     $("#xlCodeParams").val(null);

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

@@ -291,7 +291,7 @@
                                 </div>
                             </div>
                             <div class="item form-group">
-                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="discriptionParams">项目内涵
+                                <label class="control-label col-md-3 col-sm-3 col-xs-12" for="discriptionParams">项目描述
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
                                     <input type="text" id="discriptionParams"
@@ -330,6 +330,30 @@
                                            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="descriptionsParams">规格
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="descriptionsParams"
+                                           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="excludeContentParams">除外内容
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="excludeContentParams"
+                                           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="connotationParams">项目内涵
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="connotationParams"
+                                           class="form-control col-md-7 col-xs-12">
+                                </div>
+                            </div>
                         </form>
                     </div>
                     <div class="modal-footer">