shiyang / regional-platform

Download as
Browse Code ยป

Commit 1039450861a607d167ca069a0da3b30e1ada1ea7

Authored by jiangjiazhi
2 parents 5f5e322ae3 688150b4e1
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ 1039450
... ... @@ -106,7 +106,7 @@
106 106 */
107 107 @RequestMapping(value = "/queryResidentsArchiveById/{id}", method = RequestMethod.GET)
108 108 @ResponseBody
109   -// @TokenRequired
  109 + @TokenRequired
110 110 public BaseObjectResponse queryResidentsArchiveById(@PathVariable("id")String id){
111 111 BaseObjectResponse objectResponse = residentsArchiveFacade.queryResidentsArchiveById(id);
112 112 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 1039450
... ... @@ -979,6 +979,18 @@
979 979 result.setBabyDiagnosis(model.getBabyDiagnosis());
980 980 result.setBlNo(model.getBlNo());
981 981 result.setDueWeek(model.getDueWeek());
  982 +
  983 + if (StringUtils.isNotEmpty(model.getDeliverOrg()))
  984 + {
  985 + Organization org = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg()));
  986 + if (org != null)
  987 + {
  988 + result.setDeliverOrg(org.getName());
  989 + }
  990 + }
  991 +
  992 +
  993 +
982 994 return result;
983 995 }
984 996  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 1039450
... ... @@ -536,7 +536,7 @@
536 536 List<Patients> list = patientsService.queryPatient(patientsQuery);
537 537 if (CollectionUtils.isNotEmpty(list))
538 538 {
539   - HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, model.getBirth(),null);
  539 + HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false,list.get(0).getLastMenses() ,model.getBirth());
540 540 List<String> listHighRisk = res.getHighRisk();
541 541  
542 542 if (CollectionUtils.isNotEmpty(listHighRisk))