jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1d5847134f08261e0bffc3bf2be2d0ea3ff93e9c

Authored by yangfei
2 parents 68b90b9bdf a7fd103213
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 1d58471
... ... @@ -356,7 +356,7 @@
356 356 patientsQuery1.setExtEnable(false);
357 357 patientsQuery1.setId(patientId);
358 358 List<Patients> pats = patientsService.queryPatient(patientsQuery1);
359   - System.out.println("main="+pats.size());
  359 + System.out.println("main=" + pats.size());
360 360 if (CollectionUtils.isNotEmpty(pats)) {
361 361 for (Patients pat : pats) {
362 362 if (StringUtils.isNotEmpty(pat.getPid()))
... ... @@ -401,7 +401,7 @@
401 401 for (Patients pat : pats) {
402 402 if (StringUtils.isNotEmpty(pat.getPid()))
403 403 {
404   - pat.setBuildDays(DateUtil.getDays(pat.getLastMenses(), new Date()));
  404 + pat.setBuildDays(DateUtil.getDays(pat.getLastMenses(), pat.getBookbuildingDate()));
405 405 patientsService.updatePatient(pat);
406 406 }
407 407  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 1d58471
... ... @@ -227,6 +227,9 @@
227 227 }
228 228  
229 229 Patients patient = getPatientsData(yunRequest);
  230 +
  231 + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
  232 +
230 233 patient.setDueStatus(0);
231 234 //1孕妇 3 产妇
232 235 patient.setType(type);
... ... @@ -424,6 +427,8 @@
424 427 }
425 428  
426 429 Patients patient = getPatientsData(yunRequest);
  430 +
  431 + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
427 432 patient.setDueStatus(0);
428 433 //1孕妇 3 产妇
429 434 patient.setType(type);
... ... @@ -812,6 +817,7 @@
812 817  
813 818 Patients patient = getPatientsData(yunRequest);
814 819 patient.setModified(new Date());
  820 + patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
815 821  
816 822 // Integer type = ServiceObjEnums.YUNOBJ.getId();
817 823 // if (patient.getLastMenses() != null)
... ... @@ -1074,7 +1080,7 @@
1074 1080 */
1075 1081 public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1076 1082 Patients patient = new Patients();
1077   - patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
  1083 +
1078 1084 patient.setMensStartDay(yunRequest.getMensStartDay());
1079 1085  
1080 1086 patient.setMensEndDay(yunRequest.getMensEndDay());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java View file @ 1d58471
... ... @@ -370,6 +370,7 @@
370 370  
371 371 BaseObjectResponse br = new BaseObjectResponse();
372 372 Patients patients = bookbuildingFacade.getPatientsData(model);
  373 + patients.setBuildDays(DateUtil.getDays(patients.getLastMenses(), patients.getBookbuildingDate()));
373 374 Map<String, Object> map = viewFacade.getPatientViewData(patients, model.getId());
374 375 br.setData(map);
375 376 br.setErrorcode(ErrorCodeConstants.SUCCESS);