Commit d8fa5d3e94b55cfb7c6bfcb6b9625d11669f02f2
1 parent
2ad8e6d668
Exists in
dev
#fix 优化系统异常
Showing 3 changed files with 25 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
d8fa5d3
| ... | ... | @@ -2046,16 +2046,18 @@ |
| 2046 | 2046 | |
| 2047 | 2047 | double kauls = getBasicKaul(month, model.getWeight(), model.getHeight(), baby.getSex()); |
| 2048 | 2048 | if (month >= 0 && month <= 5) { |
| 2049 | - List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class); | |
| 2049 | + if (model.getFeedType()!=null){ | |
| 2050 | + List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class); | |
| 2050 | 2051 | |
| 2051 | - for (BabyDietReportModel babyDiet : babyDietReport) { | |
| 2052 | - if (null != babyDiet.getShape()) { | |
| 2053 | - if (kaupEvaluate.equals("正常") && babyDiet.getShape() == 1) { | |
| 2054 | - data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2055 | - } else if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) { | |
| 2056 | - data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2057 | - } else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) { | |
| 2058 | - data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2052 | + for (BabyDietReportModel babyDiet : babyDietReport) { | |
| 2053 | + if (null != babyDiet.getShape()) { | |
| 2054 | + if (kaupEvaluate.equals("正常") && babyDiet.getShape() == 1) { | |
| 2055 | + data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2056 | + } else if (kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) { | |
| 2057 | + data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2058 | + } else if (kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) { | |
| 2059 | + data.put("feedingGuide", babyDiet.getQdhFeedingGuide()); | |
| 2060 | + } | |
| 2059 | 2061 | } |
| 2060 | 2062 | } |
| 2061 | 2063 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
d8fa5d3
| ... | ... | @@ -517,7 +517,7 @@ |
| 517 | 517 | //生成建档短信 |
| 518 | 518 | createBuildMsg(tempP); |
| 519 | 519 | //发送产检录入 秦皇岛二院 |
| 520 | - sendbuildingMsg(tempP, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); | |
| 520 | + // sendbuildingMsg(tempP, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); | |
| 521 | 521 | |
| 522 | 522 | } |
| 523 | 523 | //秦皇岛建档获取分娩信息 |
| ... | ... | @@ -792,7 +792,7 @@ |
| 792 | 792 | @Override |
| 793 | 793 | public void run() { |
| 794 | 794 | //发送产检录入 秦皇岛二院 |
| 795 | - sendbuildingMsg(patient, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); | |
| 795 | + // sendbuildingMsg(patient, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", ""); | |
| 796 | 796 | //生成建档短信 |
| 797 | 797 | createBuildMsg(p); |
| 798 | 798 | } |
| ... | ... | @@ -1133,7 +1133,12 @@ |
| 1133 | 1133 | mr.setServiceType((templateModel.getTemplateType() == null || templateModel.getTemplateType() == 0) ? 1 : 3); //判断发送类型 |
| 1134 | 1134 | |
| 1135 | 1135 | mr.setKeyword1(patient.getUsername()); |
| 1136 | - mr.setKeyword2(DateUtil.getyyyy_MM_dd(dueDate)); | |
| 1136 | + String keyWord2=DateUtil.getyyyy_MM_dd(dueDate); | |
| 1137 | + //如果是秦皇岛二院进行产检录入 | |
| 1138 | + if ("1000000016".equals(patient.getHospitalId())){ | |
| 1139 | + keyWord2+=" (请点击小程序录入产检信息)"; | |
| 1140 | + } | |
| 1141 | + mr.setKeyword2(keyWord2); | |
| 1137 | 1142 | mr.setRemark(""); |
| 1138 | 1143 | mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 1139 | 1144 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
d8fa5d3
| ... | ... | @@ -742,9 +742,12 @@ |
| 742 | 742 | ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek() : 0)); |
| 743 | 743 | } |
| 744 | 744 | } |
| 745 | - //修改服务时增加孕周内容 cfl 20231019 | |
| 746 | - Patients patients = patientsService.findOnePatientById(ps.getParentid()); | |
| 747 | - setServiceRecordUpdate(ps, patients); | |
| 745 | + if (before.getPerType()!=2){ | |
| 746 | + //修改服务时增加孕周内容 cfl 20231019 | |
| 747 | + Patients patients = patientsService.findOnePatientById(ps.getParentid()); | |
| 748 | + setServiceRecordUpdate(ps, patients); | |
| 749 | + } | |
| 750 | + | |
| 748 | 751 | |
| 749 | 752 | patientServiceService.updatePatientService(ps); |
| 750 | 753 |