优化

src/main/java/thyyxxk/webserver/controller/medicalinsurance/MarkMtFeesController.java

@@ -29,7 +29,7 @@ public class MarkMtFeesController {
     }
 
     /**
-     * HRG查询门特备案
+     * HRG查询门诊统筹备案
      * */
     @PassToken
     @GetMapping("/fetchSpcSlwinfo")
@@ -48,7 +48,7 @@ public class MarkMtFeesController {
         mz.setTimes(param.getTimes());
         mz.setStaffId(param.getStaffId());
         ResultVo<FundDetail> result = mzService.outpatientPreSettlement(mz);
-        return getStringObjectMap(param, result, "收费窗口获取门特报销");
+        return getStringObjectMap(param, result, "收费窗口获取门诊统筹报销");
     }
 
     /**
@@ -62,7 +62,7 @@ public class MarkMtFeesController {
         mz.setTimes(param.getTimes());
         mz.setStaffId(param.getStaffId());
         ResultVo<FundDetail> result = mzService.outpatientSettlement(mz);
-        return getStringObjectMap(param, result, "收费窗口门特结算");
+        return getStringObjectMap(param, result, "收费窗口门诊统筹结算");
     }
 
     /**
@@ -78,7 +78,7 @@ public class MarkMtFeesController {
         mz.setNeedRevokeRegistration(1);
         ResultVo<FundDetail> result = mzService.revokeOutpatientSettlement(mz);
         mzService.insertSiPatInfo(mz);
-        return getStringObjectMap(param, result, "收费窗口撤销门特结算");
+        return getStringObjectMap(param, result, "收费窗口撤销门诊统筹结算");
     }
 
     private Map<String, Object> getStringObjectMap(SiMzBusinessParams param, ResultVo<FundDetail> result, String logText) {

src/main/java/thyyxxk/webserver/dao/his/inpatient/adverseevent/AdverseEventDao.java

@@ -12,9 +12,6 @@ import java.util.List;
 
 @Mapper
 public interface AdverseEventDao {
-    @Select("select dept_name from adverse_dept with(nolock) where dept_id=#{code}")
-    String getDeptName(@Param("code") String code);
-
     @Select("select rtrim(code_rs) from a_employee_mi with(nolock) where code=#{code}")
     String selectCodeRsByCode(@Param("code") String code);
 
@@ -53,7 +50,8 @@ public interface AdverseEventDao {
     @Select("select * from adverse_event with(nolock) where p_id=#{pid}")
     ReportDetail getReportDetail(@Param("pid") Integer pid);
 
-    @Select("select dept_id from adverse_dept with(nolock) where leader_code=#{code}")
+    @Select("select dept_id as deptId from adverse_dept with(nolock) where leader_code=#{code} " +
+            "union select rtrim(dept_code) as deptId from a_employee_mi where code=#{code}")
     List<String> getLeaderDepts(@Param("code") String code);
 
     @Select("<script>" +

src/main/java/thyyxxk/webserver/entity/adverseevent/ReportDetail.java

@@ -71,4 +71,8 @@ public class ReportDetail {
     private Date deleteTime;
     private Integer printed;
     private Boolean isModify;
+
+    public Boolean getModify() {
+        return null != isModify && isModify;
+    }
 }

src/main/java/thyyxxk/webserver/service/inpatient/adverseevent/AdverseEventService.java

@@ -13,6 +13,7 @@ import thyyxxk.webserver.entity.adverseevent.QueryParam;
 import thyyxxk.webserver.entity.adverseevent.ReportDetail;
 import thyyxxk.webserver.entity.adverseevent.ReportIndex;
 import thyyxxk.webserver.entity.dictionary.CodeName;
+import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ExcelUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
@@ -28,11 +29,13 @@ import java.util.*;
 @Service
 public class AdverseEventService {
     private final AdverseEventDao dao;
+    private final RedisLikeService redis;
     private static final String DEPT_LEVEL = "dept";
 
     @Autowired
-    public AdverseEventService(AdverseEventDao dao) {
+    public AdverseEventService(AdverseEventDao dao, RedisLikeService redis) {
         this.dao = dao;
+        this.redis = redis;
     }
 
     public ResultVo<String> submitNewReport(ReportDetail reportDetail) {
@@ -44,8 +47,8 @@ public class AdverseEventService {
         reportDetail.setProPatient(arrToStr(reportDetail.getProPatientArr()));
         reportDetail.setProEnviron(arrToStr(reportDetail.getProEnvironArr()));
         reportDetail.setProManage(arrToStr(reportDetail.getProManageArr()));
-        reportDetail.setDepartment(dao.getDeptName(reportDetail.getDeptCode()));
-        if (null != reportDetail.getIsModify() && reportDetail.getIsModify()) {
+        reportDetail.setDepartment(redis.getDeptName(reportDetail.getDeptCode()));
+        if (reportDetail.getModify()) {
             dao.modifyReport(reportDetail);
         } else {
             reportDetail.setTid(String.valueOf(System.currentTimeMillis()));