jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ac3a8d577703d1a5071f741ee36a9967f60a96f1

Authored by jiangjiazhi
1 parent 13c50b597f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

增加soureceid

Showing 1 changed file with 28 additions and 23 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ ac3a8d5
... ... @@ -531,10 +531,10 @@
531 531 }
532 532 String doctorUserName = null;
533 533 List<AntExChuModel> antExChuModel = antenatalExaminationService.queryAntExChu(antExChuQuery);
534   - logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel.size());
  534 + logger.info("query antexc" + patients.getId() + ". list size:" + antExChuModel.size());
535 535 if (CollectionUtils.isNotEmpty(antExChuModel))
536 536 {
537   - logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel);
  537 + logger.info("query antexc" + patients.getId() + ". list size:" + antExChuModel);
538 538 handLastRisk(patients, mamiPatient.getId());
539 539  
540 540 doctorUserName = null;
... ... @@ -555,7 +555,7 @@
555 555  
556 556 Reports reports = ConvertHelper.convertAntExChu(antExChuModel1, patients.getLastMenses(),
557 557 bgHighRisk, doctorUserName);
558   - logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:"+antExChuModel1.getId());
  558 + logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId());
559 559 handleDoctorMemeber(reports, antExChuModel1.getProdDoctor(), mamiPatient, patients, stopWatch3);
560 560 logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId());
561 561 }
... ... @@ -620,14 +620,12 @@
620 620 .aouDoctorUsersPatientsMaps(reportdoctorUsersPatientsMaps);
621 621 stopWatch3.stop();
622 622 }
623   -
624   - if (null != reports.getNextCheckTime())
625   - {
626   - com.lymsh.mommybaby.maindata.model.Patients patients1 = new com.lymsh.mommybaby.maindata.model.Patients();
627   - patients1.setId(mamiPatient.getId());
628   - patients1.setNextCheckTime(reports.getNextCheckTime());
629   - patientsService.updatePatients(patients1);
630   - }
  623 + stopWatch3.start("updateNextTime by "+mamiPatient.getId()+",next time :" +reports.getNextCheckTime());
  624 + com.lymsh.mommybaby.maindata.model.Patients patients1 = new com.lymsh.mommybaby.maindata.model.Patients();
  625 + patients1.setId(mamiPatient.getId());
  626 + patients1.setNextCheckTime(reports.getNextCheckTime());
  627 + patientsService.updateNextTime(patients1);
  628 + stopWatch3.stop();
631 629 }
632 630  
633 631 /**
... ... @@ -652,7 +650,7 @@
652 650 List<AntenatalExaminationModel> antList = antenatalExaminationService
653 651 .queryAntenatalExamination(antExQuery.convertToQuery());
654 652 String doctorUserName = null;
655   - logger.info("query antex" + patients.getId() + ". list size:"+antList.size());
  653 + logger.info("query antex" + patients.getId() + ". list size:" + antList.size());
656 654 if (CollectionUtils.isNotEmpty(antList))
657 655 {
658 656 for (AntenatalExaminationModel ant : antList)
659 657  
... ... @@ -670,9 +668,9 @@
670 668 Reports reports = ConvertHelper.convertAntExChu(ant, patients.getLastMenses(),
671 669 bgHighRisk, doctorUserName);
672 670  
673   -
  671 + logger.info("handleDoctorMemeber antex" + patients.getId() + ". antex id:" + ant.getId());
674 672 handleDoctorMemeber(reports, ant.getCheckDoctor(), mamiPatient, patients, stopWatch3);
675   -
  673 + logger.info("handleDoctorMemeber antex" + patients.getId() + ". antex id:" + ant.getId());
676 674 /* if (NumberUtils.isNumber(ant.getCheckDoctor()))
677 675 {
678 676 Users users = usersService.getUsers(Integer.valueOf(ant.getCheckDoctor()));
679 677  
... ... @@ -1224,10 +1222,10 @@
1224 1222 private void bandingMember(com.lymsh.mommybaby.maindata.model.Patients patients)
1225 1223 {
1226 1224 MembersQuery membersQuery = new MembersQuery();
1227   - if (StringUtils.isEmpty(patients.getPhone()) || 3 == patients.getType())
  1225 + /* if (StringUtils.isEmpty(patients.getPhone()) || 3 == patients.getType())
1228 1226 {
1229 1227 return;
1230   - }
  1228 + }*/
1231 1229 membersQuery.setPhone(patients.getPhone());
1232 1230 membersQuery.setYn(YnEnum.yes.getId());
1233 1231 List<Members> membersList = membersService.queryMembers(membersQuery);
1234 1232  
1235 1233  
1236 1234  
... ... @@ -1237,19 +1235,20 @@
1237 1235 membersQuery = new MembersQuery();
1238 1236 membersQuery.setPatientId(patients.getId());
1239 1237 membersQuery.setYn(YnEnum.yes.getId());
1240   - List<Members> membersList1 = membersService.queryMembers(membersQuery);
  1238 + /* List<Members> membersList1 = membersService.queryMembers(membersQuery);
1241 1239 for (Members members : membersList1)
1242 1240 {
1243 1241 Members m = new Members();
1244 1242 m.setId(members.getId());
1245 1243 m.setYn(YnEnum.no.getId());
1246 1244 membersService.updateMembers(m);
1247   - }
  1245 + }*/
1248 1246  
1249   - Patients p1 =patientsService.findMaxReportPatient(patients.getPhone());
  1247 + Patients p1 = patientsService.findMaxReportPatient(patients.getPhone());
1250 1248  
1251   - if(null!=p1){
1252   - patients=p1;
  1249 + if (null != p1)
  1250 + {
  1251 + patients = p1;
1253 1252 }
1254 1253  
1255 1254 for (Members members : membersList)
1256 1255  
... ... @@ -1262,9 +1261,15 @@
1262 1261 temp.setUsername(patients.getUsername());
1263 1262 temp.setDueDate(patients.getDueDate());
1264 1263 //member status 为2时不需要修改
1265   - if (null == members.getStatus() || 2 != members.getStatus())
  1264 + if (null != patients.getType())
1266 1265 {
1267   - temp.setStatus(patients.getType());
  1266 + if (1 == patients.getType())
  1267 + {
  1268 + temp.setStatus(1);
  1269 + } else if (3 == patients.getType())
  1270 + {
  1271 + temp.setStatus(2);
  1272 + }
1268 1273 }
1269 1274 temp.setAge(patients.getAge());
1270 1275 temp.setModified(new Date());