From 07fa12376132ff7df3543fde7530249d978bd2b1 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 22 Jul 2024 10:46:30 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=A1=AE=E8=AE=A4=E6=A1=A3=E6=A1=88=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E8=A1=80=E7=B3=96=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/ArchiveDataQuery.java | 7 ++++++- .../lyms/platform/operate/web/controller/RemoteController.java | 8 +++++++- .../operate/web/service/impl/BloodPressureServiceImpl.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java index 222e1d1..d35617d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java @@ -157,7 +157,12 @@ public class ArchiveDataQuery extends BaseQuery implements IConvertToNativeQuery condition= condition.and("phone",phone, MongoOper.IS); } if (StringUtils.isNotEmpty(type)){ - condition= condition.and("type","1", MongoOper.NE); + if ("true".equals(type)){ + condition= condition.and("type","1", MongoOper.NE); + }else { + condition= condition.and("type","1", MongoOper.IS); + } + } Criteria c = null; 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 719e622..3fb9cbb 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 @@ -218,6 +218,7 @@ public class RemoteController extends BaseController { @ResponseBody @TokenRequired public BaseListResponse queryTodayArchiveList(HttpServletRequest request, + @RequestParam(required = false) Integer type, @RequestParam(required = false) Integer assistUserId, @RequestParam(required = false) String created, @RequestParam(required = false) Integer page, @@ -241,7 +242,12 @@ public class RemoteController extends BaseController { } //大同做特殊处理只查询type为1的 if ("2100002419".equals(hospitalId)){ - query.setType("true"); + if (type!=null){ + query.setType("false"); + }else { + query.setType("true"); + } + } query.setNeed("true"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index e4dbf34..93c3dc9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -165,7 +165,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP report.setStatus(0); report.setType(bpCountType + countType); - report.setGuide(bp.getInfos().size() >= 5 ? typeGuideMap.get(report.getType()) : "在这周你的血压测量次数没有达到可以出报告的标准，但是根据你的孕周这份报告可以给你提供相应的膳食指导。"); + report.setGuide(bp.getInfos().size() >= 5 ? typeGuideMap.get(report.getType()) : "本周您的血压测量次数未达到出报告的标准（测量次数需满5次），但根据您当前的孕周，我们仍能为您定制一份适合当前阶段的膳食指导报告。"); report.setBpWaveCount(String.valueOf(bpcount)); report.setBpValExp(String.valueOf(count)); report.setYn(YnEnums.YES.getId()); -- 1.8.3.1