浏览代码

优化收费项目默认值设置问题

hurugang 3 年之前
父节点
当前提交
c51ba3157c

+ 4 - 0
src/main/java/cn/hnthyy/thmz/entity/his/mz/BillItem.java

@@ -11,6 +11,10 @@ public class BillItem {
     private String code;
     //名称
     private String name;
+    /**
+     * pyCode 拼音码
+     */
+    private String pyCode;
     //收费码
     private String chargeCode;
     //类型

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzBillItemMapper.java

@@ -25,6 +25,6 @@ public interface MzBillItemMapper {
      * 住院收费发票码 原本的
      * @return
      */
-    @Select("SELECT code,name FROM zy_bill_item order by code ")
+    @Select("SELECT code,name,py_code FROM zy_bill_item order by code ")
     List<BillItem> selectZyBillItemOri();
 }

+ 38 - 21
src/main/resources/static/js/mz/charge_detail.js

@@ -415,7 +415,8 @@ function initSelect() {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (auditCodeMap == null) {
                     auditCodeMap = new Map()
                 }
@@ -447,7 +448,8 @@ function initSelect() {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (billItemZyMap == null) {
                     billItemZyMap = new Map()
                 }
@@ -478,7 +480,8 @@ function initSelect() {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                //html += '<option value="' + comment.code + '">' + comment.name + '</option>';
+                html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')</option>';
                 if (billItemMzMap == null) {
                     billItemMzMap = new Map()
                 }
@@ -572,8 +575,14 @@ function updateZdChargeItem(code) {
                 $("#discriptionParams").val(res.data.discription);
                 $("#clCodeParams").val(res.data.clCode);
                 $('#coParams').selectpicker('val', res.data.co);
+                if(res.data.co==null || res.data.co==""){
+                    $('#coParams').selectpicker('val', 0);
+                }
                 $('#coParams').selectpicker('refresh');
                 $("#xlCodeParams").val(res.data.xlCode);
+                if(res.data.co==1 && (res.data.xlCode==null || res.data.xlCode=="")){
+                    $("#xlCodeParams").val(0.5);
+                }
                 $("#code").val(res.data.code);
                 $("div.bs-example-modal-lg").modal();
             } else {
@@ -662,27 +671,20 @@ $('#save').click(function () {
  * 清空输入框
  */
 function clearInput() {
-    $('#classCodeParams').selectpicker('val', null);
-    $('#classCodeParams').selectpicker('refresh');
-    // $("#ybCodeParmas").val(null);
-    // $("#xnhCodeParams").val(null);
-    // $("#xnhNameParams").val(null);
     $("#namePamras").val(null);
     $("#chargeUnitParams").val(null);
     $("#chargeAmountParams").val(null);
-   // $("#percentag1Params").val(null);
-    $("#percentag2Params").val(null);
-    // $("#percentag3Params").val(null);
-    // $("#percentag4Params").val(null);
-    // $("#percentag5Params").val(null);
-    $('#auditCodeParams').selectpicker('val', null);
-    $('#auditCodeParams').selectpicker('refresh');
-    $('#billItemMzParams').selectpicker('val', null);
-    $('#billItemMzParams').selectpicker('refresh');
-    $('#billItemZyParams').selectpicker('val', null);
-    $('#billItemZyParams').selectpicker('refresh');
-    $('#execUnitParams').selectpicker('val', null);
-    $('#execUnitParams').selectpicker('refresh');
+    $("#percentag2Params").val(1);
+    // $('#classCodeParams').selectpicker('val', null);
+    // $('#classCodeParams').selectpicker('refresh');
+    // $('#auditCodeParams').selectpicker('val', null);
+    // $('#auditCodeParams').selectpicker('refresh');
+    // $('#billItemMzParams').selectpicker('val', null);
+    // $('#billItemMzParams').selectpicker('refresh');
+    // $('#billItemZyParams').selectpicker('val', null);
+    // $('#billItemZyParams').selectpicker('refresh');
+    // $('#execUnitParams').selectpicker('val', null);
+    // $('#execUnitParams').selectpicker('refresh');
     $("#bzCodeParams").val(null);
     $("#discriptionParams").val(null);
     $("#clCodeParams").val(null);
@@ -690,4 +692,19 @@ function clearInput() {
     $('#coParams').selectpicker('refresh');
     $("#xlCodeParams").val(null);
     $("#code").val(null);
+}
+
+
+/**
+ * 加价率改变事件
+ */
+function setXlCodeParams() {
+    var value = $('#coParams').val();
+    if(value==1){
+        if($("#xlCodeParams").val()==null || $("#xlCodeParams").val()==""){
+            $("#xlCodeParams").val(0.5);
+        }
+    }else {
+        $("#xlCodeParams").val(null);
+    }
 }

+ 5 - 5
src/main/resources/templates/mz/charge_detail.html

@@ -136,7 +136,7 @@
                                         class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <select class="form-control selectpicker show-tick" required="required"
+                                    <select class="form-control selectpicker show-tick" required="required" data-live-search="true"
                                             id="classCodeParams" title="请选择"></select>
                                 </div>
                             </div>
@@ -238,7 +238,7 @@
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
                                     <select class="form-control selectpicker show-tick" required="required"
-                                            id="coParams" title="请选择"></select>
+                                            id="coParams" title="请选择" onchange="setXlCodeParams()"></select>
                                 </div>
                             </div>
                             <div class="item form-group">
@@ -253,7 +253,7 @@
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="auditCodeParams">核算码 <span
                                         class="required">*</span></label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <select class="form-control selectpicker show-tick" required="required"
+                                    <select class="form-control selectpicker show-tick" required="required" data-live-search="true"
                                             id="auditCodeParams" title="请选择"></select>
                                 </div>
                             </div>
@@ -261,7 +261,7 @@
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="billItemMzParams">门诊发票码 <span
                                         class="required">*</span></label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <select class="form-control selectpicker show-tick" required="required"
+                                    <select class="form-control selectpicker show-tick" required="required" data-live-search="true"
                                             id="billItemMzParams" title="请选择"></select>
                                 </div>
                             </div>
@@ -270,7 +270,7 @@
                                         class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <select class="form-control selectpicker show-tick" required="required"
+                                    <select class="form-control selectpicker show-tick" required="required" data-live-search="true"
                                             id="billItemZyParams" title="请选择"></select>
                                 </div>
                             </div>