Browse Source

收费项目

yeguodong 2 weeks ago
parent
commit
c4e0efff36

+ 20 - 0
src/main/java/cn/hnthyy/thmz/entity/his/zd/ZdChargeItem.java

@@ -156,4 +156,24 @@ public class ZdChargeItem {
     private String maxAgeRestriction;
     // 适用性别(1男2女)
     private String genderRestriction;
+
+    /**
+     * 每日限制次数
+     */
+    private String limitTimes;
+
+    /**
+     * 排他分组号
+     */
+    private String exclusiveGroup;
+
+    /**
+     * 费用分组号
+     */
+    private String feeGroup;
+
+    /**
+     * 费用分组总金额
+     */
+    private String feeGroupTotal;
 }

+ 18 - 3
src/main/java/cn/hnthyy/thmz/mapper/his/zd/ZdChargeItemMapper.java

@@ -108,7 +108,8 @@ 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,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,approval_number,selfpay_prop,group_no,zd_charge_ba_class,focus_monitor_flag,min_age_restriction,max_age_restriction,gender_restriction " +
+            "update_time,national_code,national_name,descriptions,exclude_content,connotation,approval_number,selfpay_prop,group_no,zd_charge_ba_class,focus_monitor_flag,min_age_restriction,max_age_restriction," +
+            "gender_restriction, limit_times, exclusive_group, fee_group, fee_group_total  " +
             " 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);
@@ -157,11 +158,13 @@ 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,descriptions,exclude_content," +
-            "connotation,approval_number,group_no,zd_charge_ba_class,focus_monitor_flag,min_age_restriction,max_age_restriction,gender_restriction,hnsyb_code ) VALUES (" +
+            "connotation,approval_number,group_no,zd_charge_ba_class,focus_monitor_flag,min_age_restriction,max_age_restriction,gender_restriction,hnsyb_code," +
+            "limit_times,exclusive_group,fee_group,fee_group_total ) 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}," +
-            "#{descriptions},#{excludeContent},#{connotation},#{approvalNumber},#{groupNo},#{zdChargeBaClass},#{focusMonitorFlag},#{minAgeRestriction},#{maxAgeRestriction},#{genderRestriction},#{hnsybCode} )")
+            "#{descriptions},#{excludeContent},#{connotation},#{approvalNumber},#{groupNo},#{zdChargeBaClass},#{focusMonitorFlag},#{minAgeRestriction},#{maxAgeRestriction}," +
+            "#{genderRestriction},#{hnsybCode},#{limitTimes},#{exclusiveGroup},#{feeGroup},#{feeGroupTotal} )")
     int insertZdChargeItem(ZdChargeItem zdChargeItem);
 
 
@@ -306,6 +309,18 @@ public interface ZdChargeItemMapper {
             "<when test='maxAgeRestriction!=null'>",
             ",max_age_restriction =#{maxAgeRestriction}",
             "</when>",
+            "<when test='limitTimes!=null'>",
+            ",limit_times =#{limitTimes}",
+            "</when>",
+            "<when test='exclusiveGroup!=null'>",
+            ",exclusive_group =#{exclusiveGroup}",
+            "</when>",
+            "<when test='feeGroup!=null'>",
+            ",fee_group =#{feeGroup}",
+            "</when>",
+            "<when test='feeGroupTotal!=null'>",
+            ",fee_group_total =#{feeGroupTotal}",
+            "</when>",
             "<when test='genderRestriction!=null'>",
             ",gender_restriction =#{genderRestriction}",
             "</when>",

+ 6 - 1
src/main/resources/static/js/mz/charge_detail.js

@@ -75,7 +75,8 @@ $(function () {
                 "code": $("#code").val(),"ybComment": $("#ybCommentParams").val(),"nationalCode": $("#nationalCodeParams").val(),"nationalName": $("#nationalNameParams").val(),"hnsybCode": $("#hnsybCodeParams").val(),
                 "descriptions": $("#descriptionsParams").val(),"excludeContent": $("#excludeContentParams").val(),"connotation": $("#connotationParams").val(),
                 "approvalNumber": $("#approvalNumberParams").val(),"groupNo":$("#groupNoParams").val(),"zdChargeBaClass":$("#zdChargeBaClassParams").val(),"focusMonitorFlag":$("#focusMonitorFlag").val()
-                ,"genderRestriction":$("#genderRestriction").val(),"minAgeRestriction":$("#minAgeRestriction").val(),"maxAgeRestriction":$("#maxAgeRestriction").val()}),
+                ,"genderRestriction":$("#genderRestriction").val(),"minAgeRestriction":$("#minAgeRestriction").val(),"maxAgeRestriction":$("#maxAgeRestriction").val()
+                ,"limitTimes": $("#limitTimes").val(),"exclusiveGroup": $("#exclusiveGroup").val(),"feeGroup": $("#feeGroup").val(),"feeGroupTotal": $("#feeGroupTotal").val()}),
             success: function (res) {
                 if (res == '401' || res == 401) {
                     window.location.href = '/thmz/login/view'
@@ -806,6 +807,10 @@ function updateZdChargeItem(code) {
                 $("#maxAgeRestriction").val(res.data.maxAgeRestriction);
                 $("#minAgeRestriction").val(res.data.minAgeRestriction);
                 $("#genderRestriction").val(res.data.genderRestriction);
+                $("#limitTimes").val(res.data.limitTimes);
+                $("#exclusiveGroup").val(res.data.exclusiveGroup);
+                $("#feeGroup").val(res.data.feeGroup);
+                $("#feeGroupTotal").val(res.data.feeGroupTotal);
                 $('#genderRestriction').selectpicker('refresh');
                 $('#coParams').selectpicker('val', res.data.co);
                 if(res.data.co==null || res.data.co==""){

+ 32 - 0
src/main/resources/templates/mz/charge_detail.html

@@ -373,6 +373,38 @@
                                            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="maxAgeRestriction">每日限制次数
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="limitTimes"
+                                           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="maxAgeRestriction">排他分组号
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="exclusiveGroup"
+                                           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="maxAgeRestriction">费用分组号
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="feeGroup"
+                                           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="maxAgeRestriction">费用分组总金额
+                                </label>
+                                <div class="col-md-6 col-sm-6 col-xs-12">
+                                    <input type="text" id="feeGroupTotal"
+                                           class="form-control col-md-7 col-xs-12">
+                                </div>
+                            </div>
                         </form>
                     </div>
                     <div class="modal-footer">