From c3dcdf50822fc150b19d53521f90bdb33927403a Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 9 Jul 2024 10:15:35 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E4=BA=A7=E5=90=8E?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/PostpartumReportQuery.java | 12 ++++++++---- .../platform/operate/web/controller/RemoteController.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java index dd33520..3322015 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java @@ -120,9 +120,7 @@ public class PostpartumReportQuery extends BaseQuery implements IConvertToNative } else if (null != rFactorList && !rFactorList.isEmpty()) { condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); } - if (CollectionUtils.isEmpty(rFactorList)){ - condition = condition.and("risks", false, MongoOper.EXISTS); - } + if (deliveryModel!=null){ condition=condition.and("deliveryModel", deliveryModel, MongoOper.IS); } @@ -139,7 +137,13 @@ public class PostpartumReportQuery extends BaseQuery implements IConvertToNative condition = condition.and("yn", yn, MongoOper.IS); } if (type!=null){ - condition = condition.and("type", type, MongoOper.IS); + if (type!=-1){ + condition = condition.and("type", type, MongoOper.IS); + } + }else { + if (CollectionUtils.isEmpty(rFactorList)){ + condition = condition.and("risks", false, MongoOper.EXISTS); + } } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 1cccfe5..719e622 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -552,6 +552,19 @@ public class RemoteController extends BaseController { final String cDueWeek = request.getcDueWeek(); final String lastMenses = archiveHistory.getLastMenses(); final String hospitalId=request.getHospitalId(); + if ("2100002419".equals(hospitalId)){ + List> list = new ArrayList<>(); + Map m1 = new HashMap<>(); + m1.put("serType","3"); + m1.put("serviceWeek","42"); + Map m2 = new HashMap<>(); + m2.put("serType","4"); + m2.put("serviceWeek","42"); + list.add(m1); + list.add(m2); + request.setSerInfos(list); + } + BaseObjectResponse baseObjectResponse = bookbuildingFacade.addPregnantBookbuilding(request,StringUtils.isNotEmpty(archiveUsers.getAssistUserId())?Integer.valueOf(archiveUsers.getAssistUserId()):null , false); //System.out.println("confirmArchive return :"+JsonUtil.obj2JsonString(baseObjectResponse)); if(baseObjectResponse.getErrorcode()==ErrorCodeConstants.SUCCESS){ @@ -748,7 +761,7 @@ public class RemoteController extends BaseController { private static String getArchiveId(){ Random random = new Random(); - int randomNumber = random.nextInt(8); // 生成0到8之间的随机整数 + int randomNumber = random.nextInt(8); // 生成0到7之间的随机整数 List list=new ArrayList<>(); list.add("2100006789"); list.add("2100006791"); -- 1.8.3.1