单位优化和挂号

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

@@ -29,6 +29,7 @@ import cn.hnthyy.thmz.enums.*;
 import cn.hnthyy.thmz.mapper.his.mz.*;
 import cn.hnthyy.thmz.mapper.his.yp.YpBaseYfMapper;
 import cn.hnthyy.thmz.mapper.his.yp.YpMzFytjMapper;
+import cn.hnthyy.thmz.mapper.his.yp.YpZdUnitMapper;
 import cn.hnthyy.thmz.mapper.his.zd.JcZdClassMapper;
 import cn.hnthyy.thmz.mapper.his.zd.JcZdItemMapper;
 import cn.hnthyy.thmz.mapper.his.zd.MzZdYpYshMapper;
@@ -234,6 +235,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     private WpMzPrescriptionService wpMzPrescriptionService;
     @Resource
     private WxmallPackagePurchasedItemService wxmallPackagePurchasedItemService;
+    @Resource
+    private YpZdUnitMapper ypZdUnitMapper;
 
     //是否加收开关
     @Value("${setUnitPrice}")
@@ -2068,13 +2071,13 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         }
                     }
                     if (mzChargeDetail.getDrugUnit() != null) {
-                        xyDetail.put("unitDesc", UnitTypeEnum.getUnitTypeByCode(mzChargeDetail.getDrugUnit()).name);
+                        xyDetail.put("unitDesc", ypZdUnitMapper.selectNameByCode(mzChargeDetail.getDrugUnit()));
                     }
                     if (StringUtils.isNotBlank(ypZdDict.getSpecification())) {
                         xyDetail.put("specification", ypZdDict.getSpecification());
                     }
                     xyDetail.put("quantity", mzChargeDetail.getQuantity());
-                    xyDetail.put("packUnit", UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name);
+                    xyDetail.put("packUnit", ypZdUnitMapper.selectNameByCode(ypZdDict.getPackUnit()));
                     if (StringUtils.isNotBlank(mzChargeDetail.getSupplyCode())) {
                         MzZdSupplyType mzZdSupplyType = mzZdSupplyTypeMapper.selectMzZdSupplyTypeByCode(mzChargeDetail.getSupplyCode());
                         if (mzZdSupplyType != null) {

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpZdDictServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -58,6 +59,8 @@ public class YpZdDictServiceImpl implements YpZdDictService {
     @SuppressWarnings("all")
     @Autowired
     private EmployeeMapper employeeMapper;
+    @Resource
+    private YpZdUnitMapper ypZdUnitMapper;
     @Override
     public YpZdDict queryYpZdDictByCodeAndSerial(String code,String serial) {
         YpZdDict ypZdDict= ypZdDictMapper.selectYpZdDictByCodeAndSerial(code,serial);
@@ -65,16 +68,16 @@ public class YpZdDictServiceImpl implements YpZdDictService {
             return ypZdDict;
         }
         if(StringUtils.isNotBlank(ypZdDict.getWeighUnit())){
-            ypZdDict.setWeighUnitDesc(UnitTypeEnum.getUnitTypeByCode(ypZdDict.getWeighUnit()).name);
+            ypZdDict.setWeighUnitDesc(ypZdUnitMapper.selectNameByCode(ypZdDict.getWeighUnit()));
         }
         if(StringUtils.isNotBlank(ypZdDict.getVolUnit())){
-            ypZdDict.setVolUnitDesc(UnitTypeEnum.getUnitTypeByCode(ypZdDict.getVolUnit()).name);
+            ypZdDict.setVolUnitDesc(ypZdUnitMapper.selectNameByCode(ypZdDict.getVolUnit()));
         }
         if(StringUtils.isNotBlank(ypZdDict.getPackUnit())){
-            ypZdDict.setPackUnitDesc(UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name);
+            ypZdDict.setPackUnitDesc(ypZdUnitMapper.selectNameByCode(ypZdDict.getPackUnit()));
         }
         if(StringUtils.isNotBlank(ypZdDict.getMiniUnit())){
-            ypZdDict.setMiniUnitDesc(UnitTypeEnum.getUnitTypeByCode(ypZdDict.getMiniUnit()).name);
+            ypZdDict.setMiniUnitDesc(ypZdUnitMapper.selectNameByCode(ypZdDict.getMiniUnit()));
         }
         return ypZdDict;
     }

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/MzZdYpYshServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hnthyy.thmz.entity.his.yp.YpZdDict;
 import cn.hnthyy.thmz.entity.his.zd.MzZdYpYsh;
 import cn.hnthyy.thmz.enums.UnitTypeEnum;
 import cn.hnthyy.thmz.mapper.his.yp.YpZdDictMapper;
+import cn.hnthyy.thmz.mapper.his.yp.YpZdUnitMapper;
 import cn.hnthyy.thmz.mapper.his.zd.MzZdYpYshMapper;
 import cn.hnthyy.thmz.service.his.zd.MzZdYpYshService;
 import cn.hutool.core.convert.Convert;
@@ -14,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -26,6 +28,8 @@ public class MzZdYpYshServiceImpl implements MzZdYpYshService {
     @SuppressWarnings("all")
     @Autowired
     private YpZdDictMapper ypZdDictMapper;
+    @Resource
+    private YpZdUnitMapper ypZdUnitMapper;
 
     @Override
     public List<MzZdYpYsh> queryMzZdYpYshByCommonParamsAndGroupNo(String commonParams, String groupNo) {
@@ -48,7 +52,7 @@ public class MzZdYpYshServiceImpl implements MzZdYpYshService {
         }
         if (mzZdYpYshes != null && mzZdYpYshes.size() > 0) {
             mzZdYpYshes.stream().forEach(m -> {
-                m.setMiniUnitName(UnitTypeEnum.getUnitTypeByCode(m.getMiniUnit()).name);
+                m.setMiniUnitName(ypZdUnitMapper.selectNameByCode(m.getMiniUnit()));
                 try {
                     if (m.getSpecification().indexOf("x") > 0) {
                         m.setDrugWinDesc(m.getSpecification().substring(0, m.getSpecification().indexOf("x")));

src/main/java/cn/hnthyy/thmz/service/impl/thmz/RationalUseServiceImpl.java

@@ -19,6 +19,7 @@ import cn.hnthyy.thmz.enums.UnitTypeEnum;
 import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.mapper.his.mz.MzChargeDetailMapper;
 import cn.hnthyy.thmz.mapper.his.mz.MzPatientMiMapper;
+import cn.hnthyy.thmz.mapper.his.yp.YpZdUnitMapper;
 import cn.hnthyy.thmz.mapper.thmz.ClinicMapper;
 import cn.hnthyy.thmz.service.his.mz.EmployeeService;
 import cn.hnthyy.thmz.service.his.mz.MzVisitTableService;
@@ -75,6 +76,8 @@ public class RationalUseServiceImpl implements RationalUseService {
     private ConfigService configService;
     @Resource
     private WpMzPrescriptionService wpMzPrescriptionService;
+    @Resource
+    private YpZdUnitMapper ypZdUnitMapper;
 
     /**
      * 提交药品分析
@@ -407,9 +410,9 @@ public class RationalUseServiceImpl implements RationalUseService {
                         .append("<quantity>").append(nullToBlank(quantity + ypZdDict.getPackUnitDesc())).append("</quantity>")
                         .append("<group>").append(mzChargeDetail.getGroupOrder()).append("</group>")
                         .append("<reason>").append("</reason>")
-                        .append("<dose_unit>").append(StringUtils.isNotBlank(mzChargeDetail.getDrugUnit()) ? UnitTypeEnum.getUnitTypeByCode(mzChargeDetail.getDrugUnit()).name : "").append("</dose_unit>")
+                        .append("<dose_unit>").append(StringUtils.isNotBlank(mzChargeDetail.getDrugUnit()) ? ypZdUnitMapper.selectNameByCode(mzChargeDetail.getDrugUnit()) : "").append("</dose_unit>")
                         .append("<dose>").append(mzChargeDetail.getDrugQuan()).append("</dose>")
-                        .append("<zl_unit>").append(StringUtils.isNotBlank(ypZdDict.getPackUnit()) ? UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name : "").append("</zl_unit>")
+                        .append("<zl_unit>").append(StringUtils.isNotBlank(ypZdDict.getPackUnit()) ? ypZdUnitMapper.selectNameByCode(ypZdDict.getPackUnit()) : "").append("</zl_unit>")
                         .append("<kyzl>").append(quantity).append("</kyzl>")
                         .append("<freq>").append("MZ").append(nullToBlank(mzChargeDetail.getFrequency())).append("</freq>")
                         .append("<administer>").append("MZ").append(mzChargeDetail.getSupplyCode()).append("</administer>")

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

@@ -148,9 +148,9 @@ $(function () {
     /**
      * 创建核酸检查（混检）处方并保存
      */
-    $("#saveHybridTest").on("click", function (t) {
-        saveHybridTest();
-    });
+    // $("#saveHybridTest").on("click", function (t) {
+    //     saveHybridTest();
+    // });
 
     /**
      * 跳转到（混检）缴费界面
@@ -1260,8 +1260,8 @@ function extracted(res) {
         $("#clearIcCardNo").show();
     }
     if (res.data.patientId != null && res.data.patientId != "") {
-        $("#nucleicAcid").show();
-        $("#hybridTest").show();
+        // $("#nucleicAcid").show();
+        // $("#hybridTest").show();
         $("#editUser").show();
     }
     readonlyOrNot(true);
@@ -1650,7 +1650,7 @@ function saveMzyReqrec() {
     //病历本费用
     var blbFee = 0;
     if (zlkCheckbox) {
-        zlkFee = 1;
+        zlkFee = 2;
     }
     if (blbCheckbox) {
         blbFee = 1;