Sfoglia il codice sorgente

新增按照执行科室查询

xiaochan 5 mesi fa
parent
commit
4a32858cfe

+ 1 - 0
src/main/java/thyyxxk/webserver/entity/xmlr/dto/XmlrQueryFee.java

@@ -24,4 +24,5 @@ public class XmlrQueryFee {
     private Integer admissTimes;
     private Integer ledgerSn;
     private String infantFlag;
+    private String execDept;
 }

+ 3 - 5
src/main/java/thyyxxk/webserver/service/inpatient/xmlr/XiangMuLuRuService.java

@@ -115,6 +115,7 @@ public class XiangMuLuRuService {
         return ResultVoUtil.success(feeResult);
     }
 
+
     public QueryWrapper<?> getQueryWrapper(XmlrQueryFee params) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         String usCode = TokenUtil.getInstance().getTokenUserId();
@@ -160,11 +161,8 @@ public class XiangMuLuRuService {
             qw.ne("isnull(nullif(rtrim(a.serial), ''), '00')", "00");
         }
 
-        if (params.getMedicalTechnology()) {
-            if (!publicServer.needRule(1)) {
-                Set<String> childDeptByUserCode = publicServer.getChildDeptByUserCode(usCode);
-                qw.in("exec_unit", childDeptByUserCode);
-            }
+        if (StrUtil.isNotBlank(params.getExecDept())) {
+            qw.eq("exec_unit", params.getExecDept());
         }
 
         if (params.getRefundSymbol() == 0) {