From a3da2fd9c94ac2b3d0954637dbc6ffd28e946626 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 8 Apr 2022 18:59:48 +0800 Subject: [PATCH] update --- .../src/main/resources/mainOrm/master/MasterMysqlAntexc.xml | 6 +++--- .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index 402adc4..403068d 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -2977,10 +2977,10 @@ INNER JOIN report_patients p ON p.patientId = f.sourceId WHERE p.ENABLE IS NULL - AND f.fmHospital ]]> #{hospitalId} - AND p.hospitalId ]]> #{hospitalId} + AND f.fmHospital ]]> '2100001605' + AND p.hospitalId ]]> '2100001605' - AND f.dueDate1 = ]]> #{startTime} + AND f.dueDate1 >= #{startTime} AND f.dueDate1 #{endTime} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 2fd6d52..0e74af7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -3991,7 +3991,6 @@ public class MatDeliverFacade { List> wyjdbyfm =mysqlAntexcService.getLhWyFmManage(param2); //外院建档外院分娩 Map param3 = new HashMap(); - param2.put("hospitalId",hospitalId);//当前登录用户医院的id param3.put("startTime",startTime); param3.put("endTime",endTime); int wyjdwyfm =mysqlAntexcService.getLhWyJdWyFmManage(param3); -- 1.8.3.1