优化

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

@@ -3,6 +3,7 @@ package cn.hnthyy.thmz.controller;
 import cn.hnthyy.thmz.Utils.AddressResolutionUtil;
 import cn.hnthyy.thmz.comment.UserLoginToken;
 import cn.hnthyy.thmz.entity.his.mz.CodeNameEntity;
+import cn.hnthyy.thmz.entity.his.mz.MzOrderFrequency;
 import cn.hnthyy.thmz.enums.*;
 import cn.hnthyy.thmz.service.his.RegionService;
 import cn.hnthyy.thmz.service.his.mz.*;
@@ -49,6 +50,8 @@ public class CommonController {
     private RegionService regionService;
     @Autowired
     private ZdChargeBaClassService zdChargeBaClassService;
+    @Autowired
+    private MzOrderFrequencyService mzOrderFrequencyService;
     //websocket 地址前半部分
     @Value("${webSocketHost}")
     private String webSocketHost;
@@ -447,12 +450,20 @@ public class CommonController {
             resultMap.put("code", 0);
             resultMap.put("message", "查询西药所有频次成功");
             List<Map<String, Object>> data = new ArrayList<>();
-            OrderFrequencyEnum.WESTERN_MEDICINE_ORDER_FREQUENCY.stream().forEach(orderFrequencyEnum -> {
-                Map<String, Object> temp = new HashMap<>();
-                temp.put("code", orderFrequencyEnum.code);
-                temp.put("name", orderFrequencyEnum.name);
-                temp.put("times", orderFrequencyEnum.times);
-                data.add(temp);
+            //OrderFrequencyEnum.WESTERN_MEDICINE_ORDER_FREQUENCY.stream().forEach(orderFrequencyEnum -> {
+            //    Map<String, Object> temp = new HashMap<>();
+            //    temp.put("code", orderFrequencyEnum.code);
+            //    temp.put("name", orderFrequencyEnum.name);
+            //    temp.put("times", orderFrequencyEnum.times);
+            //    data.add(temp);
+            //});
+            List<MzOrderFrequency> mzOrderFrequencyEff = mzOrderFrequencyService.getMzOrderFrequencyEff();
+            mzOrderFrequencyEff.stream().forEach(o->{
+                    Map<String, Object> temp = new HashMap<>();
+                    temp.put("code", o.getCode());
+                    temp.put("name", o.getComm());
+                    temp.put("times", o.getTimes());
+                    data.add(temp);
             });
             resultMap.put("data", data);
             return resultMap;

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -185,6 +185,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     @SuppressWarnings("all")
     @Autowired
     private OpRecordMapper opRecordMapper;
+    @Autowired
+    private MzOrderFrequencyService mzOrderFrequencyService;
     //是否加收开关
     @Value("${setUnitPrice}")
     private boolean setUnitPrice;
@@ -1480,8 +1482,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     if (zyPrescription.size() == 0) {
                         tempMap = new HashMap<>();
                         tempMap.put("zyfs", mzChargeDetail.getDrugWin());
-                        OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
-                        tempMap.put("frequency", orderFrequencyEnum != null ? orderFrequencyEnum.name : "");
+                        //OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        MzOrderFrequency mzOrderFrequencyByCode = mzOrderFrequencyService.getMzOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        tempMap.put("frequency", mzOrderFrequencyByCode != null ? mzOrderFrequencyByCode.getComm() : "");
                         tempMap.put("cyJssm", mzChargeDetail.getCyJssm() != null ? mzChargeDetail.getCyJssm() : "");
                         tempMap.put("cyJsl", mzChargeDetail.getCyJsl() != null ? mzChargeDetail.getCyJsl() : "");
                         tempMap.put("cyZql", mzChargeDetail.getCyZql() != null ? mzChargeDetail.getCyZql() : "");
@@ -1578,8 +1581,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         zlDetail.put("drugQuan", mzChargeDetail.getDrugQuan());
                         zlDetail.put("drugUnit", mzChargeDetail.getDrugUnit());
                         zlDetail.put("orderDays", mzChargeDetail.getOrderDays());
-                        OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
-                        zlDetail.put("frequency", orderFrequencyEnum != null ? orderFrequencyEnum.name : "");
+                        //OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        MzOrderFrequency mzOrderFrequencyByCode = mzOrderFrequencyService.getMzOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        zlDetail.put("frequency", mzOrderFrequencyByCode != null ? mzOrderFrequencyByCode.getComm() : "");
                         zlDetail.put("quantity", mzChargeDetail.getQuantity());
                         if (StringUtils.isNotBlank(mzChargeDetail.getInstructionText())) {
                             zlDetail.put("instructionCode", mzChargeDetail.getInstructionCode());
@@ -1650,9 +1654,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         }
                     }
                     if (StringUtils.isNotBlank(mzChargeDetail.getFrequency())) {
-                        OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
-                        if (orderFrequencyEnum != null) {
-                            xyDetail.put("frequency", orderFrequencyEnum.name);
+                        //OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        MzOrderFrequency mzOrderFrequencyByCode = mzOrderFrequencyService.getMzOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        if (mzOrderFrequencyByCode != null) {
+                            xyDetail.put("frequency", mzOrderFrequencyByCode.getComm());
                         }
                     }
                     if (mzChargeDetail.getOrderDays() != null) {
@@ -2414,7 +2419,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         }
                         mzChargeDetail.setDrugWin(1);
                         mzChargeDetail.setGroupType(Constants.XYF.equals(ypZdDict.getBillItemMz()) ? "1" : "2");
-                        mzChargeDetail.setSupplyAmount(mzChargeDetail.getOrderDays() * OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency()).times);
+                        MzOrderFrequency mzOrderFrequency = mzOrderFrequencyService.getMzOrderFrequencyByCode(mzChargeDetail.getFrequency());
+                        Integer freTimes = mzOrderFrequency == null ? 1 : mzOrderFrequency.getTimes();
+                        mzChargeDetail.setSupplyAmount(mzChargeDetail.getOrderDays() * freTimes);
                     } else if (Constants.CYF.equals(ypZdDict.getBillItemMz())) {
                         if (Constants.GRANULA_DRUG_KIND.equals(ypZdDict.getDrugKind())) {
                             mzChargeDetail.setGroupNo(Constants.GRANULA_GROUP_NO);

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

@@ -1363,9 +1363,6 @@ function readonlyOrNot(flag) {
  * 查询默认打印机
  */
 function setPrint() {
-    if (printIndex >= 0) {
-        return;
-    }
     $.ajax({
         type: "GET",
         url: '/thmz/getLastWindowsByCurrentUser',
@@ -1379,10 +1376,11 @@ function setPrint() {
                 return;
             }
             if (res.code == 0) {
-                printIndex = res.data.printIndex;
+                 printIndex = res.data.printIndex;
             } else {
-                printIndex = -1;
+                 printIndex = -1;
             }
+            return;
         }
     });
 }