xiaochan 1 jaar geleden
bovenliggende
commit
6c29897125
1 gewijzigde bestanden met toevoegingen van 14 en 14 verwijderingen
  1. 14 14
      src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/PatientInfoQueryService.java

+ 14 - 14
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/PatientInfoQueryService.java

@@ -53,46 +53,46 @@ public class PatientInfoQueryService {
         QueryWrapper<?> qw = new QueryWrapper<>();
 
         if (StringUtil.notBlank(param.getPatNo())) {
-            qw.eq("inpatient_no", param.getPatNo());
+            qw.eq("a.inpatient_no", param.getPatNo());
         }
         if (StringUtil.notBlank(param.getName())) {
-            qw.like("name", param.getName());
+            qw.like("a.name", param.getName());
         }
         if (ListUtil.notBlank(param.getAdmissionTime())) {
-            qw.ge("admiss_date", param.getAdmissionTime().get(0));
-            qw.le("admiss_date", param.getAdmissionTime().get(1));
+            qw.ge("a.admiss_date", param.getAdmissionTime().get(0));
+            qw.le("a.admiss_date", param.getAdmissionTime().get(1));
         }
         if (ListUtil.notBlank(param.getDischargeTime())) {
-            qw.ge("dis_date", param.getDischargeTime().get(0));
-            qw.le("dis_date", param.getDischargeTime().get(1));
+            qw.ge("a.dis_date", param.getDischargeTime().get(0));
+            qw.le("a.dis_date", param.getDischargeTime().get(1));
         }
         if (StringUtil.notBlank(param.getDept())) {
-            qw.eq("dept", param.getDept());
+            qw.eq("a.dept", param.getDept());
         }
         if (StringUtil.notBlank(param.getWard())) {
-            qw.eq("ward", param.getWard());
+            qw.eq("a.ward", param.getWard());
         }
         if (StringUtil.notBlank(param.getDiagnosticCode())) {
             if (param.getIsPrimaryDiagnosis()) {
-                qw.gt(String.format("(select count(1) from t_case_frontsheet_disdiag where inpatient_no = bah and admiss_times = times " +
+                qw.gt(String.format("(select count(1) from t_case_frontsheet_disdiag  where a.inpatient_no = t_case_frontsheet_disdiag.bah and a.admiss_times = t_case_frontsheet_disdiag.times " +
                         " and code = '%s' and no = 1 )", param.getDiagnosticCode()), 0);
             } else {
-                qw.gt(String.format("(select count(1) from t_case_frontsheet_disdiag where inpatient_no = bah and admiss_times = times " +
+                qw.gt(String.format("(select count(1) from t_case_frontsheet_disdiag where a.inpatient_no = t_case_frontsheet_disdiag.bah and a.admiss_times = t_case_frontsheet_disdiag.times " +
                         " and code = '%s')", param.getDiagnosticCode()), 0);
             }
         }
         if (StringUtil.notBlank(param.getEmpCode())) {
-            qw.eq("refer_physician", param.getEmpCode());
+            qw.eq("a.refer_physician", param.getEmpCode());
         }
         if (StringUtil.notBlank(param.getDisDept())) {
-            qw.eq("dis_dept", param.getDisDept());
+            qw.eq("a.dis_dept", param.getDisDept());
         }
 
         if (param.getEmrAudit().equals(1)) {
-            qw.gt("(select count(1) from emr_audit_detail where pat_no = inpatient_no and times = admiss_times)", 0);
+            qw.gt("(select count(1) from emr_audit_detail emr where pat_no = a.inpatient_no and emr.times = a.admiss_times)", 0);
         }
         if (param.getEmrAudit().equals(2)) {
-            qw.eq("(select count(1) from emr_audit_detail where pat_no = inpatient_no and times = admiss_times)", 0);
+            qw.eq("(select count(1) from emr_audit_detail emr where pat_no = a.inpatient_no and emr.times = a.admiss_times)", 0);
         }
 
         List<Patient> list = dao.getPatInfo(qw, param.getLeaveHospital() ? "zy_inactpatient" : "zy_actpatient");