diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index 4dce112..65b6135 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -44,6 +44,10 @@ public class AntExRecordService { @Autowired private IAntExRecordMDao iAntExRecordMDao; + + @Autowired + private AntenatalExaminationService antenatalExaminationService; + public List aggregateOne(AntExRecordQuery antExRecordQuery) { return antExRecordDao.aggregateOne(antExRecordQuery.convertToQuery()); } @@ -176,6 +180,9 @@ public class AntExRecordService { antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery()); syncSingle(parentId); + + //产检节点统计孕妇范围首次计算 + antenatalExaminationService.handleCheckPoint(parentId); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index 0d74f48..0297b24 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -130,16 +130,18 @@ public class AntenatalExaminationService { } } + //产检节点统计孕妇范围首次计算 handleCheckPoint(antExRecordModel.getPid()); } } /** - * 产检统计中计算各个产检节点 的是否是节点中的首次节点 + * 产检统计中计算各个产检节点 + * 的是否是节点中的首次节点 * @param pid */ - private void handleCheckPoint(String pid) + public void handleCheckPoint(String pid) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index a8cf790..5e91b89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -67,7 +67,6 @@ public class TestController { @Autowired private AntenatalExaminationService antenatalExaminationService; - @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; @@ -388,113 +387,114 @@ public class TestController { public void run() { for(PersonModel person : models) { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setPid(person.getId()); - List pats = patientsService.queryPatient1(patientsQuery,"created"); - - Map> temps = new HashMap>(); - - if (CollectionUtils.isNotEmpty(pats)) - { - for(Patients pat : pats) - { - if (pat.getLastMenses() != null) - { - Object obj = temps.get(DateUtil.getyyyy_MM_dd(pat.getLastMenses())); - if (obj != null) - { - List cc = (List)obj; - cc.add(pat); - temps.put(DateUtil.getyyyy_MM_dd(pat.getLastMenses()),cc); - } - else - { - List cc = new ArrayList(); - cc.add(pat); - temps.put(DateUtil.getyyyy_MM_dd(pat.getLastMenses()),cc); - } - } - } - } - - if (!temps.isEmpty()) - { - for(String key : temps.keySet()) - { - List ids = new ArrayList(); - List patientses = temps.get(key); - if (CollectionUtils.isNotEmpty(patientses)) - { - for(Patients patients : patientses) - { - ids.add(patients.getId()); - } - } - - if (CollectionUtils.isNotEmpty(ids)) - { - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setParentIds(ids); - for (int i = 0 ; i < 7 ; i++) - { - if (i == 0) - { - antExRecordQuery.setcDueWeekStart(0); - antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1); - } - else if (i == 1) - { - antExRecordQuery.setcDueWeekStart(13*7); - antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1); - } - else if (i == 2) - { - antExRecordQuery.setcDueWeekStart(16*7); - antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); - } - else if (i == 3) - { - antExRecordQuery.setcDueWeekStart(21*7); - antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); - } - else if (i == 4) - { - antExRecordQuery.setcDueWeekStart(25*7); - antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1); - } - else if (i == 5) - { - antExRecordQuery.setcDueWeekStart(28*7); - antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); - } - else if (i == 6) - { - antExRecordQuery.setcDueWeekStart(37*7); - antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); - } - - List list = recordService.queryAntExRecords(antExRecordQuery); - if (CollectionUtils.isNotEmpty(list)) - { - for (int j = 0 ; j < list.size() ; j++) - { - AntExRecordModel m = list.get(j); - if (j == (list.size() - 1)) - { - m.setIsFirst(1); - } - else - { - m.setIsFirst(2); - } - recordService.updateOne(m,m.getId()); - } - } - } - } - } - } + antenatalExaminationService.handleCheckPoint(person.getId()); +// PatientsQuery patientsQuery = new PatientsQuery(); +// patientsQuery.setYn(YnEnums.YES.getId()); +// patientsQuery.setPid(person.getId()); +// List pats = patientsService.queryPatient1(patientsQuery,"created"); +// +// Map> temps = new HashMap>(); +// +// if (CollectionUtils.isNotEmpty(pats)) +// { +// for(Patients pat : pats) +// { +// if (pat.getLastMenses() != null) +// { +// Object obj = temps.get(DateUtil.getyyyy_MM_dd(pat.getLastMenses())); +// if (obj != null) +// { +// List cc = (List)obj; +// cc.add(pat); +// temps.put(DateUtil.getyyyy_MM_dd(pat.getLastMenses()),cc); +// } +// else +// { +// List cc = new ArrayList(); +// cc.add(pat); +// temps.put(DateUtil.getyyyy_MM_dd(pat.getLastMenses()),cc); +// } +// } +// } +// } +// +// if (!temps.isEmpty()) +// { +// for(String key : temps.keySet()) +// { +// List ids = new ArrayList(); +// List patientses = temps.get(key); +// if (CollectionUtils.isNotEmpty(patientses)) +// { +// for(Patients patients : patientses) +// { +// ids.add(patients.getId()); +// } +// } +// +// if (CollectionUtils.isNotEmpty(ids)) +// { +// AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); +// antExRecordQuery.setParentIds(ids); +// for (int i = 0 ; i < 7 ; i++) +// { +// if (i == 0) +// { +// antExRecordQuery.setcDueWeekStart(0); +// antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1); +// } +// else if (i == 1) +// { +// antExRecordQuery.setcDueWeekStart(13*7); +// antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1); +// } +// else if (i == 2) +// { +// antExRecordQuery.setcDueWeekStart(16*7); +// antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); +// } +// else if (i == 3) +// { +// antExRecordQuery.setcDueWeekStart(21*7); +// antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); +// } +// else if (i == 4) +// { +// antExRecordQuery.setcDueWeekStart(25*7); +// antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1); +// } +// else if (i == 5) +// { +// antExRecordQuery.setcDueWeekStart(28*7); +// antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); +// } +// else if (i == 6) +// { +// antExRecordQuery.setcDueWeekStart(37*7); +// antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); +// } +// +// List list = recordService.queryAntExRecords(antExRecordQuery); +// if (CollectionUtils.isNotEmpty(list)) +// { +// for (int j = 0 ; j < list.size() ; j++) +// { +// AntExRecordModel m = list.get(j); +// if (j == (list.size() - 1)) +// { +// m.setIsFirst(1); +// } +// else +// { +// m.setIsFirst(2); +// } +// recordService.updateOne(m,m.getId()); +// } +// } +// } +// } +// } +// } } } });