违规收费分析添加执行科室

src/main/java/thyyxxk/webserver/constants/sidicts/MedType.java

@@ -83,13 +83,13 @@ public enum MedType {
 
     public static String getName(String code) {
         if (StringUtil.isBlank(code)) {
-            return null;
+            return SELF_PAY.getName();
         }
         for (MedType medType : MedType.values()) {
             if (code.trim().equals(medType.getCode())) {
                 return medType.getName();
             }
         }
-        return null;
+        return SELF_PAY.getName();
     }
 }

src/main/java/thyyxxk/webserver/dao/his/reports/IllegalChargesAnalysisDao.java

@@ -49,12 +49,11 @@ public interface IllegalChargesAnalysisDao {
     @Update("update t_illegal_charge_template set label=#{label}, value=#{value},attribute=#{attribute} where id=#{id}")
     void updateTemplate(IllegalChargeTemplate template);
 
-    @Select("select a.inpatient_no,a.admiss_times, " +
+    @Select("select a.inpatient_no,a.admiss_times,rtrim(a.exec_unit) as execUnit, " +
             "name=(select rtrim(name) from a_patient_mi t where t.inpatient_no=a.inpatient_no), " +
             "medtype=(select med_type from t_si_pat_info t " +
             "where t.pat_no=a.inpatient_no and t.times=a.admiss_times and t.ledger_sn=a.ledger_sn), " +
-            "deptName=(select rtrim(name) from zd_unit_code where code=a.ward_code), " +
-            "wardName=(select rtrim(name) from zd_unit_code where code=a.dept_code), " +
+            "rtrim(a.ward_code) as deptName,rtrim(a.dept_code) wardName, " +
             "diag=(select rtrim(dis_diag_comment) from zy_dis_diag_yb t where t.inpatient_no=a.inpatient_no " +
             "and t.admiss_times=a.admiss_times and t.dis_diag_no=1), detail_sn,charge_date, " +
             "rtrim(charge_code_mx) as chargeCode, chargeName=rtrim(isnull((select name from zd_charge_item " +

src/main/java/thyyxxk/webserver/entity/reports/illegalchargesanalysis/IllegalChargeData.java

@@ -21,6 +21,7 @@ public class IllegalChargeData {
     private String wardName;
     private String diag;
     private Float orderNo;
+    private String execUnit;
     private Integer detailSn;
     private String chargeCode;
     private String chargeName;
@@ -30,6 +31,7 @@ public class IllegalChargeData {
     private String chargeAmount;
     private Float conflictOrderNo;
     private Integer conflictDetailSn;
+    private String conflictExecUnit;
     private String conflictChargeCode;
     private String conflictChargeName;
     private Date conflictChargeDate;

src/main/java/thyyxxk/webserver/service/reports/IllegalChargesAnalysisService.java

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.constants.sidicts.MedType;
 import thyyxxk.webserver.dao.his.reports.IllegalChargesAnalysisDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
@@ -11,6 +12,7 @@ import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.entity.reports.illegalchargesanalysis.IllegalChargeData;
 import thyyxxk.webserver.entity.reports.illegalchargesanalysis.IllegalChargeTemplate;
 import thyyxxk.webserver.entity.reports.illegalchargesanalysis.SearchChargeItem;
+import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.ListUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
@@ -31,13 +33,15 @@ import java.util.Map;
 @Service
 public class IllegalChargesAnalysisService {
     private final IllegalChargesAnalysisDao dao;
+    private final RedisLikeService redis;
     private static final String DASH = "_";
     private static final String ADMIN = "admin";
     private static final String ADMIN_2 = "admin_2";
 
     @Autowired
-    public IllegalChargesAnalysisService(IllegalChargesAnalysisDao dao) {
+    public IllegalChargesAnalysisService(IllegalChargesAnalysisDao dao, RedisLikeService redis) {
         this.dao = dao;
+        this.redis = redis;
     }
 
     public ResultVo<List<IllegalChargeTemplate>> fetchMyTemplates() {
@@ -199,6 +203,10 @@ public class IllegalChargesAnalysisService {
                     String key = item.getInpatientNo() + "_" + item.getChargeDay();
                     if (map.containsKey(key)) {
                         IllegalChargeData data = map.get(key);
+                        data.setExecUnit(redis.getDeptName(data.getExecUnit()));
+                        data.setDeptName(redis.getDeptName(data.getDeptName()));
+                        data.setWardName(redis.getDeptName(data.getWardName()));
+                        data.setMedtypeName(MedType.getName(item.getMedtype()));
                         data.setConflictChargeCode(item.getChargeCode());
                         data.setConflictChargeAmount(item.getChargeAmount());
                         data.setConflictChargeDate(item.getChargeDate());
@@ -206,6 +214,7 @@ public class IllegalChargesAnalysisService {
                         data.setConflictChargeName(item.getChargeName());
                         data.setConflictDetailSn(item.getDetailSn());
                         data.setConflictOrderNo(item.getOrderNo());
+                        data.setConflictExecUnit(redis.getDeptName(item.getExecUnit()));
                         resultList.add(data);
                     }
                 }