Ver Fonte

解决套餐编码错误的问题

hurugang há 3 anos atrás
pai
commit
c94250a8ee

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

@@ -118,4 +118,6 @@ public class ZdChargeItem {
     private BigDecimal num;
     //收费总金额 非数据库字段
     private BigDecimal totalAmount;
+    //套餐编码非数据库字段
+    private String tcCode;
 }

+ 1 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/JcJyItemChargeServiceImpl.java

@@ -115,6 +115,7 @@ public class JcJyItemChargeServiceImpl implements JcJyItemChargeService {
             for (ZdChargeItem zd : zdChargeItemList) {
                 zd.setNum(map.get(zd.getCode()));
                 zd.setTotalAmount((zd.getChargeAmount() == null ? BigDecimal.ZERO : zd.getChargeAmount()).multiply(zd.getNum() == null ? BigDecimal.ZERO : zd.getNum()));
+                zd.setTcCode(code);
             }
         }
         return zdChargeItemList;

+ 3 - 8
src/main/resources/static/js/mz/clinic.js

@@ -4362,7 +4362,7 @@ function getJcJyItemChargeByCode(code) {
         sortable: true,                     //是否启用排序
         sortOrder: "asc",                   //排序方式
         queryParams: function (params) {
-            var itemCodeSearch = $("#itemCodeSearch").val()
+            var itemCodeSearch = $("#itemCodeSearch").val();
             if (itemCodeSearch == null || itemCodeSearch == "") {
                 itemCodeSearch = $("#current_code").val();
             }
@@ -4394,16 +4394,11 @@ function getJcJyItemChargeByCode(code) {
         },
         columns: [
             {
+                field: 'tcCode',
                 title: '项目编码',
                 align: "center",
                 valign: 'middle',
                 // sortable: true
-                formatter: function (value, row, index) {
-                    if (code == null || code == "") {
-                        code = $("#current_code").val();
-                    }
-                    return code;
-                }
             }, {
                 field: 'code',
                 title: '收费编码',
@@ -5639,7 +5634,7 @@ function getMzPrescriptionVoUnPaid(patientId, times, clnicId) {
     var currentPatientId = $("#patientId").val();
     //当前接诊的用户和操作接诊的是同一个人,不做任何操作
     if (currentPatientId == patientId) {
-        warningMesageSimaple("当前病人正在接诊中,请勿 重复操作!");
+        warningMesageSimaple("当前病人正在接诊中,请勿重复操作!");
         return;
     }
     if (currentPatientId == null || currentPatientId == "") {