From 875cecb65180d061a560d86154923f68c8c196b4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 14 May 2024 17:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=90=8C=20=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E4=BA=A7=E6=A3=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=88=86=E5=A8=A9=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=8C=BB=E7=94=9F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntExRecordFacade.java | 14 +++++++------- .../platform/operate/web/facade/MatDeliverFacade.java | 16 ++++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index d57f928..1fb5750 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -8,7 +8,6 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; @@ -25,13 +24,11 @@ import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import com.mongodb.BasicDBObject; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -48,7 +45,6 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -137,7 +133,7 @@ public class AntExRecordFacade { * @param isRegion */ private AntExRecordQuery complayRequest(Integer userId, AntExManagerQueryRequest antExManagerQueryRequest, boolean isRegion, String isPage) { - + String hospitalId = autoMatchFacade.getHospitalId(userId); AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setSieveType(antExManagerQueryRequest.getSieveType()); @@ -221,8 +217,12 @@ public class AntExRecordFacade { antExRecordQuery.setType(2); } //产检医生 - if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ - antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); + if("2100002419".equals(hospitalId)){//大同 + antExRecordQuery.setcId(userId == null ? "" : userId.toString()); + }else{ + if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){ + antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor()); + } } /*滦平 end */ 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 3541319..c9b377b 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 @@ -7,7 +7,6 @@ import com.lyms.hospitalapi.lcdcf.LcdcfHisModel; import com.lyms.hospitalapi.lcdcf.LcdcfHisService; import com.lyms.hospitalapi.pojo.WhfyHisModel; import com.lyms.hospitalapi.whfy.WhfyHisService; -import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -21,7 +20,6 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.BabyAfterVisitService; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.operate.web.utils.ResolveUtils; import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.operate.web.worker.*; import com.lyms.platform.permission.model.*; @@ -53,12 +51,14 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.Date; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; @@ -2703,8 +2703,12 @@ public class MatDeliverFacade { patientsQuery.setSort("fmDate"); //隆化需求按接诊医生查询 //&&"2100001605".equals(hid) 去掉，前台入参有这个参数 - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { - patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); + if("2100002419".equals(hid)){//大同 + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getOperatorId() == null ? "" : childbirthManagerRequest.getOperatorId().toString()); + }else{ + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { + patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); + } } patientsQuery.setYyzyfmHospitalId(childbirthManagerRequest.getYyzyfmHospitalId()); -- 1.8.3.1