fangcheng / regional-platform

Download as
Browse Code »

Commit 1847bfbff6e2832d51733bf2ef4241df0dab9d10

Authored by hanshaofeng
2 parents 9747a1cdfd 0b14ec29d5
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java View file @ 1847bfb
... ... @@ -18,5 +18,7 @@
18 18 public List<BabyCheckModel> queryBabyCheckRecord(MongoQuery query);
19 19  
20 20 List<BabyCheckModel> queryLastCheck(List<String> ids);
  21 +
  22 + List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids);
21 23 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java View file @ 1847bfb
... ... @@ -53,6 +53,16 @@
53 53 AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
54 54 return result.getMappedResults();
55 55 }
  56 + @Override
  57 + public List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids) {
  58 +
  59 + AggregationOperation match = Aggregation.match(Criteria.where("buildId").in(ids).and("yn").is(1));
  60 + AggregationOperation group = Aggregation.group("_id","diagnose").max("created").as("created");
  61 + AggregationOperation fields = Aggregation.project("_id", "diagnose");
  62 + Aggregation aggregation = Aggregation.newAggregation(match, group,fields);
  63 + AggregationResults<BabyCheckModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_babycheck", BabyCheckModel.class);
  64 + return result.getMappedResults();
  65 + }
56 66  
57 67  
58 68 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java View file @ 1847bfb
... ... @@ -81,5 +81,10 @@
81 81 public List<BabyCheckModel> queryLastCheck(List<String> ids) {
82 82 return babyCheckDao.queryLastCheck(ids);
83 83 }
  84 +
  85 + public List<BabyCheckModel> queryLastDiagnoseCheck(List<String> ids) {
  86 + return babyCheckDao.queryLastDiagnoseCheck(ids);
  87 +
  88 + }
84 89 }
platform-common/src/main/java/com/lyms/platform/common/utils/ExceptionUtils.java View file @ 1847bfb
... ... @@ -14,5 +14,9 @@
14 14 public static void catchException(Exception exception,String message){
15 15 logger.error(message,exception);
16 16 }
  17 +
  18 + public static void catchException(String message){
  19 + logger.error(message);
  20 + }
17 21 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 1847bfb
... ... @@ -160,12 +160,12 @@
160 160 PersonModelQuery personModelQuery = new PersonModelQuery();
161 161 personModelQuery.setYn(YnEnums.YES.getId());
162 162 personModelQuery.setId(builds.get(0).getPid());
163   - Collections.reverse(list);
  163 +// Collections.reverse(list);
164 164 List<PersonModel> personModels = personService.queryPersons(personModelQuery);
165 165  
166 166 List<Map<String, String>> tempList = new ArrayList<>();
167 167 babyCheckFacade.getBabyCheckList(buildIds, personModels.get(0), tempList);
168   - Collections.reverse(tempList);
  168 +// Collections.reverse(tempList);
169 169 list.addAll(tempList);
170 170 }
171 171  
... ... @@ -512,6 +512,8 @@
512 512 return;
513 513 }
514 514  
  515 + ExceptionUtils.catchException("儿童建档1---------->"+babyModel.getMphone()+";name="+babyModel.getName());
  516 +
515 517 SmsTemplateQuery query = new SmsTemplateQuery();
516 518 query.setYn(YnEnums.YES.getId());
517 519 query.setStatus(1);
518 520  
... ... @@ -591,10 +593,12 @@
591 593  
592 594 if (CollectionUtils.isNotEmpty(sendList)) {
593 595  
  596 +
594 597 //短信前缀
595 598 String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor());
596 599 for (SmsTemplateModel templateModel : sendList) {
597 600 if (templateModel != null && templateModel.getStatus() == 1) {
  601 + ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName());
598 602 MessageListRequest smsList = new MessageListRequest();
599 603 List<MessageRequest> messages = new ArrayList<>();
600 604 MessageRequest mr = new MessageRequest();
... ... @@ -971,7 +975,7 @@
971 975 result.setBabyHeight(model.getBabyHeight());
972 976 result.setBabyWeight(model.getBabyWeight());
973 977 result.setBabyHead(model.getBabyHead());
974   - result.setDeliverOrg(model.getDeliverOrg());
  978 + result.setDeliverOrg(model.getOrg());
975 979 result.setMalformation(model.getMalformation());
976 980 result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
977 981  
... ... @@ -1447,7 +1451,7 @@
1447 1451 for (BabyModel model : models) {
1448 1452 BabyManageListResult result = new BabyManageListResult();
1449 1453 result.setId(model.getId());
1450   - if (model.getHighRisk() == null || model.getHighRisk() == 0) {
  1454 + if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
1451 1455 result.setHighRisk("健康");
1452 1456 } else {
1453 1457 result.setHighRisk("高危");
... ... @@ -1593,8 +1597,8 @@
1593 1597 babyQuery.setBuildDateStart(DateUtil.parseYMD(dates[0]));
1594 1598 if(dates.length>=2){
1595 1599 Date date= DateUtil.parseYMD(dates[1]);
1596   - if(dates[0].equals(dates[1])){
1597   - long d = DateUtil.parseYMD(dates[1]).getTime() + 86398000;
  1600 + if(null!=date){
  1601 + long d = date.getTime() + 86398000;
1598 1602 date = new Date(d);
1599 1603 }
1600 1604 babyQuery.setBuildDateEnd(date);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 1847bfb
... ... @@ -629,7 +629,7 @@
629 629 }
630 630 if (CollectionUtils.isNotEmpty(ids))
631 631 {
632   - List<BabyCheckModel> checkModels = babyCheckService.queryLastCheck(ids);
  632 + List<BabyCheckModel> checkModels = babyCheckService.queryLastDiagnoseCheck(ids);
633 633 if (CollectionUtils.isNotEmpty(checkModels) && checkModels.get(0) != null)
634 634 {
635 635 diagnose = checkModels.get(0).getDiagnose();
... ... @@ -986,7 +986,7 @@
986 986 ageType = 1;
987 987 }
988 988  
989   - //查询该月龄的年龄别体重值
  989 + //查询身高别体重
990 990 List<AwModel> list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw);
991 991  
992 992 if(CollectionUtils.isNotEmpty(list))
993 993  
994 994  
995 995  
996 996  
... ... @@ -995,24 +995,33 @@
995 995  
996 996 //查询该月龄的年龄别体重值
997 997 List<AwModel> aws = babyCheckService.queryBabyHealthConfig(monthAge, sex,0);
998   - if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1)
  998 + if (CollectionUtils.isNotEmpty(aws))
999 999 {
1000 1000 AwModel model = aws.get(0);
1001   - AwModel model1 = aws.get(1);
1002 1001  
1003   - if(model.getType() == 1)
1004   - {
1005   - model = aws.get(1);
1006   - model1 = aws.get(0);
1007   - }
1008   -
1009 1002 //低于参考人群的年龄别体重的M -2s
1010 1003 if (model.getRtwoDs() > weight)
1011 1004 {
1012 1005 growthEvaluate.add("低体重");
1013 1006 }
1014   - if (value != null)
  1007 + }
  1008 +
  1009 + List<AwModel> aws1 = babyCheckService.queryBabyHealthConfig(monthAge, sex,1);
  1010 + if (CollectionUtils.isNotEmpty(aws1))
  1011 + {
  1012 + AwModel model = aws1.get(0);
  1013 + if (weight > list.get(0).getPtwoDs() && height < model.getRtwoDs())
1015 1014 {
  1015 + growthEvaluate.add("生长迟缓");
  1016 + }
  1017 + if (weight < list.get(0).getPtwoDs() && height < model.getRtwoDs())
  1018 + {
  1019 + growthEvaluate.add("慢性严重营养不良");
  1020 + }
  1021 + }
  1022 +
  1023 + if (value != null)
  1024 + {
1016 1025 //中位数百分比
1017 1026 Double mp = weight/value;
1018 1027 if (mp < 0.8)
1019 1028  
... ... @@ -1031,17 +1040,8 @@
1031 1040 {
1032 1041 growthEvaluate.add("肥胖");
1033 1042 }
1034   - }
1035   -
1036   - if (weight > list.get(0).getPtwoDs() && height < model1.getRtwoDs())
1037   - {
1038   - growthEvaluate.add("生长迟缓");
1039   - }
1040   - if (weight < list.get(0).getPtwoDs() && height < model1.getRtwoDs())
1041   - {
1042   - growthEvaluate.add("慢性严重营养不良");
1043   - }
1044 1043 }
  1044 +
1045 1045 }
1046 1046 BaseObjectResponse br = new BaseObjectResponse();
1047 1047 br.setData(growthEvaluate);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1847bfb
... ... @@ -494,7 +494,7 @@
494 494 babyModel.setPid(personService.addPerson(personModel).getId());
495 495  
496 496  
497   - ExceptionUtils.catchException(new Exception(),"分娩---------->"+babyModel.getMphone()+";name="+babyModel.getName());
  497 + ExceptionUtils.catchException("分娩---------->"+babyModel.getMphone()+";name="+babyModel.getName());
498 498 //儿童建档
499 499 babyBookbuildingFacade.createBuildSms(babyModel);
500 500  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 1847bfb
... ... @@ -103,6 +103,7 @@
103 103 patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
104 104 patients.setType(3);
105 105 patients.setEnable("1");
  106 + patients.setBuildType(0);
106 107 patientsService.updatePatient(patients);
107 108 }
108 109 postReviewModel.setPid(patients.getPid());