lighter 2 years ago
parent
commit
0a0e826802

+ 3 - 1
src/main/java/thyyxxk/webserver/dao/his/search/SearchDao.java

@@ -9,7 +9,9 @@ import thyyxxk.webserver.entity.dictionary.CodeName;
 
 @Mapper
 public interface SearchDao {
-    @Select("select rtrim(code) as code,rtrim(name) name from a_employee_mi where isnull(del_flag,0)!=1 and ${method} like #{content}")
+    @Select("select rtrim(code) as code,rtrim(name) name," +
+            "deptName=(select rtrim(d.name) from zd_unit_code d where d.code=dept_code) " +
+            "from a_employee_mi where isnull(del_flag,0)!=1 and ${method} like #{content}")
     IPage<CodeName> searchPhysician(IPage<CodeName> iPage, @Param("method") String method, @Param("content") String content);
 
     @Select("select distinct rtrim(yb_code) as code, rtrim(yb_name) as name from zd_icd_code_new where ${method} like #{content} and del_flag=0")

+ 1 - 0
src/main/java/thyyxxk/webserver/entity/dictionary/CodeName.java

@@ -13,6 +13,7 @@ public class CodeName {
     private String ssfz;
     private String deptName;
     private String ybCode;
+    private Integer statusFlag;
     private boolean disabled;
 
     public CodeName() {

+ 1 - 1
src/main/java/thyyxxk/webserver/service/inpatient/DismissService.java

@@ -237,7 +237,7 @@ public class DismissService {
         BigDecimal feeOffset = dao.getFeeOffset(patNo, times, ledgerSn);
         if (feeOffset.compareTo(BigDecimal.ZERO) != 0) {
             ExceptionEnum exception = ExceptionEnum.LOGICAL_ERROR;
-            BigDecimal beforeAdmFee = dao.selectOverTimeLimitFee(patNo, times, ledgerSn, "<", begntime);
+            BigDecimal beforeAdmFee = dao.selectOverTimeLimitFee(patNo, times, ledgerSn, "<=", begntime);
             if (beforeAdmFee.compareTo(BigDecimal.ZERO) != 0) {
                 exception.setMessage("此患者明细费用与账页费用不一致,有【" + beforeAdmFee + "元】小于入院时间的费用。");
                 throw new BizException(exception);