From f762b4ab4051f09b80d02829bad81c98a4d3b3fb Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 8 Mar 2024 10:09:33 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E4=BA=A7=E5=A6=87=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=96TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/permission/model/CheckItem.java | 2 +- .../web/controller/MatDeliverController.java | 8 +++--- .../web/controller/PuerperaManageController.java | 1 + .../web/facade/AntenatalExaminationFacade.java | 1 + .../operate/web/facade/BabyBookbuildingFacade.java | 1 + .../operate/web/facade/BasicConfigFacade.java | 2 +- .../operate/web/facade/MatDeliverFacade.java | 31 ++++++++++++++++++++-- 7 files changed, 39 insertions(+), 7 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java index bcf146c..75a9e85 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java @@ -6,7 +6,7 @@ public class CheckItem { private String projectInfo; private String checkAttention; private String hospitalId; - private Integer type;//类型 1孕妇 2 儿童 + private Integer type;//类型 1孕妇 2 儿童 3产妇 public Integer getType() { return type; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 46f94b6..7e45310 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -879,13 +879,15 @@ public class MatDeliverController extends BaseController { /** * 小程序查询产妇产周 - * @param idCard + * @param * @return */ @RequestMapping(value = "/getDueDateByWeChat", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse getDueDateByWeChat(@RequestParam(required = false)String idCard,@RequestParam(required = false)String pid){ - return matDeliverFacade.getDueDateByWeChat(idCard,pid); + public BaseObjectResponse getDueDateByWeChat(@RequestParam(required = false)String cardNo, + @RequestParam(required = false)String vcCardNo, + @RequestParam(required = false)String pid){ + return matDeliverFacade.getDueDateByWeChat(cardNo,vcCardNo,pid); } @RequestMapping(value = "/vs1/test", method = RequestMethod.GET) public void test(){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 1b2425e..8786766 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -454,6 +454,7 @@ public class PuerperaManageController extends BaseController { @ResponseBody public BaseResponse getEnums() { Map map = new HashMap<>(); + //TODO gwfz增加缓存 map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); List list = new ArrayList(); for (int i = 5; i <= 100; i = i + 5) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b530379..78f3cf6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -4652,6 +4652,7 @@ public class AntenatalExaminationFacade { } public BaseResponse getEnums(Integer userId) { + //TODO 添加缓存 Map map = new HashMap <>(); // 胎动情况 map.put("quickenEnum", EnumUtil.toJson(QuickenEnums.class)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 44b83d9..02fd9d7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2776,6 +2776,7 @@ public class BabyBookbuildingFacade { basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); basicConfigQuery.setKeyword(keyword); + //TODO 判读keyword 如果是null走缓存 List datas = basicConfigService.queryBasicConfig(basicConfigQuery); // System.out.println(basicConfigQuery.convertToQuery().convertToMongoQuery()); List configResults = new ArrayList <>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 0f8cd6a..8316358 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -114,7 +114,7 @@ public class BasicConfigFacade { dispNewHighRisk(basicConfigList, mainBasicConfigList); } - + //TODO 根据orgId增加高危缓存 BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(mainBasicConfigList); return baseResponse; 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 f2b97a4..3541319 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 @@ -4273,14 +4273,38 @@ public class MatDeliverFacade { * @param idCard * @return */ - public BaseObjectResponse getDueDateByWeChat(String idCard,String pid) { + public BaseObjectResponse getDueDateByWeChat(String idCard,String vcCardNo,String pid) { PatientsQuery patientsQuery = new PatientsQuery(); - if (StringUtils.isNotEmpty(idCard)){ + /* if (StringUtils.isNotEmpty(idCard)){ patientsQuery.setCardNo(idCard); } + if (StringUtils.isNotEmpty(vcCardNo)){ + patientsQuery.setVcCardNo(vcCardNo); + }*/ if (StringUtils.isNotEmpty(pid)){ patientsQuery.setPid(pid); } + //如果参数传patient id ，肯定应该以id为查询条件 cfl 20230927 + if (StringUtils.isNotEmpty(idCard)) { + //如果查询是卡号11位数且1开头，认为是手机号码 cfl 20231128 + if(idCard.length() == 11 && idCard.startsWith("1")){ + patientsQuery.setPhone(idCard); + }else{ + patientsQuery.setCardNo(idCard); + } + + } + + //id 和卡号都为空，才有可能使用就诊卡号查询 cfl 20230927 + if (StringUtils.isNotEmpty(vcCardNo)) { + //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy + /* if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); + } else {*/ + patientsQuery.setVcCardNo(vcCardNo); + //} + } + patientsQuery.setYn(1); List patientsList = patientsService.queryPatient(patientsQuery); BaseObjectResponse objectResponse = new BaseObjectResponse(); @@ -4334,6 +4358,9 @@ public class MatDeliverFacade { private static int getTime(Date dueDate) { int days = DateUtil.daysBetween(dueDate, new Date()); + if(days==0){ + return 1; + } return days%7==0?days/7:days/7+1; } private HighScoreResult queryRisk(List id) { -- 1.8.3.1