diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 5efd640..cf9708f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -249,7 +249,7 @@ public class PatientsService { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setDueStatus(0); patientsQuery.setType(1); - System.out.println("查询出满足预产期前两周的孕妇："+patientsQuery.convertToQuery().convertToMongoQuery()); + System.out.println("查询出满足预产期前两周的孕妇：" + patientsQuery.convertToQuery().convertToMongoQuery()); List patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(patientses)) { logger.info("处理预产期前两周的孕妇数据，进入分娩住院追访 size:" + patientses.size()); @@ -261,7 +261,7 @@ public class PatientsService { downRecordQuery.setParentId(trackDownRecord.getParentId()); List records = trackDownRecordService.queryTrackDown(downRecordQuery); //不存在追访或者追访未结束流程并且追访类型小于分娩住院 - if (CollectionUtils.isEmpty(records) || (records.get(0).getStatus() == 1 && ((records.get(0).getTrackType()==TrackDownDateEnums.H.getId()|| records.get(0).getTrackType()==TrackDownDateEnums.I.getId()))|| records.get(0).getTrackType() < TrackDownDateEnums.E.getId())) { + if (CollectionUtils.isEmpty(records) || (records.get(0).getStatus() == 1 && ((records.get(0).getTrackType() == TrackDownDateEnums.H.getId() || records.get(0).getTrackType() == TrackDownDateEnums.I.getId())) || records.get(0).getTrackType() < TrackDownDateEnums.E.getId())) { trackDownRecord.setHospitalId(patient.getHospitalId()); trackDownRecord.setSource(patient.getId()); trackDownRecord.setStatus(1); @@ -287,7 +287,7 @@ public class PatientsService { handSieveTrack(); //开始处理产检、产筛追访数据进入分娩追访 - // patientAutoFm(); + patientAutoFm(); //自动流转产后复查转出或产后访视转出 trackAutoFlow(); @@ -307,7 +307,7 @@ public class PatientsService { downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.F.getId(), TrackDownDateEnums.G.getId(), TrackDownDateEnums.K.getId())); List records = trackDownRecordService.queryTrackDown(downRecordQuery); - System.out.println("开始处理产后复查、产后访视追访数据:"+records.size()); + System.out.println("开始处理产后复查、产后访视追访数据:" + records.size()); for (TrackDownRecord tr : records) { Patients patients = iPatientDao.getPatient(tr.getParentId()); if (patients != null && patients.getFmDate() != null) {//分娩时间不为空 @@ -321,10 +321,10 @@ public class PatientsService { tr.setTrackType(TrackDownDateEnums.J.getId()); } } - }else{//不显示 + } else {//不显示 tr.setStatus(0); } - }else if (patients == null){ + } else if (patients == null) { tr.setStatus(0); } trackDownRecordService.updateTrackDown(tr, tr.getId()); @@ -340,11 +340,11 @@ public class PatientsService { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.C.getId(), TrackDownDateEnums.D.getId(), TrackDownDateEnums.H.getId(), TrackDownDateEnums.I.getId())); List records = trackDownRecordService.queryTrackDown(downRecordQuery); - System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+records.size()); + System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + records.size()); for (TrackDownRecord tr : records) { Patients patients = iPatientDao.getPatient(tr.getParentId()); if (patients != null && patients.getType() == 3) {//产妇 - System.out.println("产检追访已经分娩："+patients.getId()); + System.out.println("产检追访已经分娩：" + patients.getId()); //分娩距当前时间天数 int day = DateUtil.daysBetween(patients.getFmDate(), new Date()); if (day <= 60) {//产后60天内，可做产后访视或产后复查环节 @@ -353,8 +353,8 @@ public class PatientsService { } else { tr.setTrackType(TrackDownDateEnums.F.getId()); } - }else{//否则不显示 - System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+patients.getId()); + } else {//否则不显示 + System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + patients.getId()); tr.setStatus(0); } trackDownRecordService.updateTrackDown(tr, tr.getId()); @@ -377,13 +377,15 @@ public class PatientsService { if (patients == null || tr == null) { tr.setStatus(0); System.out.println("处理产筛追访数据，孕周大于20周自动进入产检追访:patient为空" + tr.getParentId()); - }else { - int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); - if (week > 20) {//不能做产前筛查追访，显示产前检查追访 - if (tr.getTrackType() == TrackDownDateEnums.C.getId()) { - tr.setTrackType(TrackDownDateEnums.I.getId()); - } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) { - tr.setTrackType(TrackDownDateEnums.E.getId()); + } else { + if (patients.getLastMenses() != null) { + int week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); + if (week > 20) {//不能做产前筛查追访，显示产前检查追访 + if (tr.getTrackType() == TrackDownDateEnums.C.getId()) { + tr.setTrackType(TrackDownDateEnums.I.getId()); + } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) { + tr.setTrackType(TrackDownDateEnums.E.getId()); + } } } } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index 0be700b..f25a484 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -740,15 +740,15 @@ public class ConvertHelper { // } // } String gongGao = ""; - if(StringUtils.isNotEmpty(antExChuModel.getGonggao())){ + if (StringUtils.isNotEmpty(antExChuModel.getGonggao())) { gongGao = StringUtils.unitHandle(antExChuModel.getGonggao(), UnitConstants.CM); } - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()))){ - gongGao +=GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()); + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()))) { + gongGao += GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()); } - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoType()))){ - gongGao +=GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType()); + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoType()))) { + gongGao += GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType()); } antChuJson.put("gongGao", gongGao); //腹围 @@ -943,6 +943,10 @@ public class ConvertHelper { //流产 antChuJson.put("abortion", abortion.toString()); + if (patients.getCardNo().equals("440101199905016942")) { + System.out.println("处理440101199905016942...."); + } + String ycNum = StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI); String ccNum = StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI); String lccNum = StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI); @@ -950,10 +954,17 @@ public class ConvertHelper { //孕产史 antChuJson.put("hisGestation", "孕次:" + - ycNum==null?"":ycNum + " 产次:" + - ccNum==null?"":ccNum + " 流产次:" + - lccNum==null?"":lccNum + " 存活胎儿数:" + - chNum==null?"":chNum); + (ycNum == null ? "" : ycNum) + " 产次:" + + (ccNum == null ? "" : ccNum) + " 流产次:" + + (lccNum == null ? "" : lccNum) + " 存活胎儿数:" + + (chNum == null ? "" : chNum)); + + + System.out.println("孕产史：" + "孕次:" + + (ycNum == null ? "" : ycNum) + " 产次:" + + (ccNum == null ? "" : ccNum) + " 流产次:" + + (lccNum == null ? "" : lccNum) + " 存活胎儿数:" + + (chNum == null ? "" : chNum)); try { //国家高危+自定义高危 List highrisks = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); @@ -1104,9 +1115,9 @@ public class ConvertHelper { //诊断其他 antChuJson.put("diagnosisOther", antExChuModel.getDiagnosisOther()); //处理意见 - if(StringUtils.isNotEmpty(antExChuModel.getTreatOpinion())){ + if (StringUtils.isNotEmpty(antExChuModel.getTreatOpinion())) { antChuJson.put("treatOpinion", antExChuModel.getTreatOpinion()); - }else{ + } else { antChuJson.put("treatOpinion", getTreatmentOpinion3(antExChuModel.getTreatmentOpinion2())); } //指导意见 @@ -1454,15 +1465,15 @@ public class ConvertHelper { String gongGao = ""; - if(StringUtils.isNotEmpty(antExFuModel.getGongGao())){ + if (StringUtils.isNotEmpty(antExFuModel.getGongGao())) { gongGao = StringUtils.unitHandle(antExFuModel.getGongGao(), UnitConstants.CM); } - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()))){ - gongGao +=GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()); + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()))) { + gongGao += GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()); } - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoType()))){ - gongGao +=GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType()); + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoType()))) { + gongGao += GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType()); } antFuJson.put("gongGao", gongGao); @@ -1542,9 +1553,9 @@ public class ConvertHelper { //指导意见其他 antFuJson.put("diagnosisOther", antExFuModel.getDiagnosisOther()); //处理意见 - if(StringUtils.isNotEmpty(antExFuModel.getTreatmentOpinion())){ + if (StringUtils.isNotEmpty(antExFuModel.getTreatmentOpinion())) { antFuJson.put("treatOpinion", antExFuModel.getTreatmentOpinion()); - }else{ + } else { antFuJson.put("treatOpinion", getTreatmentOpinion3(antExFuModel.getTreatmentOpinion2())); } antFuJson.put("checkDoctor", checkDoctor); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index ad28cc4..389b934 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -52,7 +52,13 @@ public class TrackDownFacade { public void export(TrackDownQueryRequest downQueryRequest, Integer userId,HttpServletResponse response) { //转换为本地的查询条件 - TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); + //转换为本地的查询条件 + TrackDownRecordQuery downRecordQuery; + try { + downRecordQuery = convertNaviteQuery(downQueryRequest, userId); + }catch (Exception e){ + return ; + } //不分页 downRecordQuery.setNeed(null); @@ -270,7 +276,7 @@ public class TrackDownFacade { * @param downQueryRequest * @return */ - private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) { + private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) throws Exception{ boolean isPatient = false; String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -349,6 +355,9 @@ public class TrackDownFacade { patientsQuery.setQueryNo(downQueryRequest.getKey()); System.out.println("过滤条件："+patientsQuery.convertToQuery().convertToMongoQuery()); List patientses = patientsService.queryPatient(patientsQuery); + if(CollectionUtils.isEmpty(patientses)){ + throw new Exception("没有找到数据"); + } List pids = new ArrayList<>(); for (Patients ps : patientses) { pids.add(ps.getId()); @@ -531,7 +540,12 @@ public class TrackDownFacade { */ public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { //转换为本地的查询条件 - TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); + TrackDownRecordQuery downRecordQuery; + try { + downRecordQuery = convertNaviteQuery(downQueryRequest, userId); + }catch (Exception e){ + return new BaseObjectResponse(); + } List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>(); TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());