From 7f651cc172b59ceb541e4e6a4372b44945409065 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 9 Aug 2024 18:11:14 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=87=BA=E7=94=9F?= =?UTF-8?q?=E8=AF=81=E6=98=8E=E4=B8=80=E4=BB=B6=E4=BA=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/PatientsQuery.java | 14 +++++ .../operate/web/controller/BirthController.java | 4 +- .../operate/web/facade/BabyNutritionFacade.java | 63 +++++++++++++--------- 3 files changed, 53 insertions(+), 28 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 9e72142..f9b5f69 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -445,6 +445,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String dept; //大同审核建档 0为待审核 1为正常 private boolean isArchive=false; + //病历号(住院号) + private String blNo; + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } public boolean isArchive() { return isArchive; @@ -785,6 +795,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("highRiskFileCode", highRiskFileCode, MongoOper.IS); } + if (StringUtils.isNotEmpty(blNo)){ + condition = condition.and("blNo", blNo, MongoOper.IS); + + } if (null != isComplete) { condition = condition.and("isComplete", isComplete, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java index 7043736..17e3376 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java @@ -45,11 +45,11 @@ public class BirthController extends BaseController { @RequestMapping(value = "/getPatientList", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse getPatientList(HttpServletRequest request,String vcCardNo + public BaseResponse getPatientList(HttpServletRequest request,String blNo ,String cardNo,String name,String fmDateStart,String fmDateEnd,Integer page,Integer limit){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); PatientsQuery patientsQuery=new PatientsQuery(); - patientsQuery.setVcCardNo(vcCardNo); + patientsQuery.setBlNo(blNo); patientsQuery.setCardNo(cardNo); patientsQuery.setName(name); patientsQuery.setPage(page); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 70b411c..763fb3c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -1688,29 +1688,34 @@ public class BabyNutritionFacade { //获取对应月龄的医生建议 BabyDietSuggestModel dietDoctorSuggests = mongoTemplate.findOne(Query.query(Criteria.where("type").is(1).and("monthAge").is(month)), BabyDietSuggestModel.class); - List> doctorSuggests = dietDoctorSuggests.getDoctorSuggests(); - List> tempList = list.subList(0, items); - for (int i = 0; i < tempList.size() ; i++) - { - //没有添加对应月龄的食物 add 0 为未添加 1为添加 - if (tempList.get(i).get("add") != null && tempList.get(i).get("add") != 1) + if (dietDoctorSuggests!= null){ + List> doctorSuggests = dietDoctorSuggests.getDoctorSuggests(); + List> tempList = list.subList(0, items); + for (int i = 0; i < tempList.size() ; i++) { - dss.add(doctorSuggests.get(i)); - } - else - { //对应月龄添加了食物，才再判断是否爱吃 love 0为不爱吃 1为爱吃 - if(tempList.get(i).get("love") != null && tempList.get(i).get("love") != 1) + //没有添加对应月龄的食物 add 0 为未添加 1为添加 + if (tempList.get(i).get("add") != null && tempList.get(i).get("add") != 1) { - noLovelType = tempList.get(i).get("type") < noLovelType ? tempList.get(i).get("type") : noLovelType; + dss.add(doctorSuggests.get(i)); + } + else + { //对应月龄添加了食物，才再判断是否爱吃 love 0为不爱吃 1为爱吃 + if(tempList.get(i).get("love") != null && tempList.get(i).get("love") != 1) + { + noLovelType = tempList.get(i).get("type") < noLovelType ? tempList.get(i).get("type") : noLovelType; + } } } } + data.put("suggests", null); if (noLovelType != 100) { BabyDietSuggestModel dietSuggestModel1 = mongoTemplate.findOne(Query.query(Criteria.where("type").is(2).and("level").is(noLovelType)), BabyDietSuggestModel.class); - data.put("suggests", dietSuggestModel1.getSuggests()); + if (dietSuggestModel1!=null){ + data.put("suggests", dietSuggestModel1.getSuggests()); + } } data.put("doctorSuggests", dss); } @@ -2251,29 +2256,35 @@ public class BabyNutritionFacade { //获取对应月龄的医生建议 BabyDietSuggestModel dietDoctorSuggests = mongoTemplate.findOne(Query.query(Criteria.where("type").is(1).and("monthAge").is(month)), BabyDietSuggestModel.class); - List> doctorSuggests = dietDoctorSuggests.getQhdfyDoctorSuggests(); - List> tempList = list.subList(start, end); - for (int i = 0; i < tempList.size() ; i++) - { - //没有添加对应月龄的食物 add 0 为未添加 1为添加 - if (tempList.get(i).get("add") != null && tempList.get(i).get("add") != 1) + if (dietDoctorSuggests!=null){ + List> doctorSuggests = dietDoctorSuggests.getQhdfyDoctorSuggests(); + List> tempList = list.subList(start, end); + for (int i = 0; i < tempList.size() ; i++) { - dss.add(doctorSuggests.get(i)); - } - else - { //对应月龄添加了食物，才再判断是否爱吃 love 0为不爱吃 1为爱吃 - if(tempList.get(i).get("love") != null && tempList.get(i).get("love") != 1) + //没有添加对应月龄的食物 add 0 为未添加 1为添加 + if (tempList.get(i).get("add") != null && tempList.get(i).get("add") != 1) { - noLovelType = tempList.get(i).get("type") < noLovelType ? tempList.get(i).get("type") : noLovelType; + dss.add(doctorSuggests.get(i)); + } + else + { //对应月龄添加了食物，才再判断是否爱吃 love 0为不爱吃 1为爱吃 + if(tempList.get(i).get("love") != null && tempList.get(i).get("love") != 1) + { + noLovelType = tempList.get(i).get("type") < noLovelType ? tempList.get(i).get("type") : noLovelType; + } } } } + data.put("suggests", null); if (noLovelType != 100) { BabyDietSuggestModel dietSuggestModel1 = mongoTemplate.findOne(Query.query(Criteria.where("type").is(2).and("level").is(noLovelType)), BabyDietSuggestModel.class); - data.put("suggests", dietSuggestModel1.getSuggests()); + if (dietSuggestModel1!=null){ + data.put("suggests", dietSuggestModel1.getSuggests()); + } + } data.put("doctorSuggests", dss); } -- 1.8.3.1