jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f96f38d952fa7fc188c3578d8055a7bc30787dfd

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

追访模块Bug修改

Showing 3 changed files with 65 additions and 38 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ f96f38d
... ... @@ -249,7 +249,7 @@
249 249 patientsQuery.setYn(YnEnums.YES.getId());
250 250 patientsQuery.setDueStatus(0);
251 251 patientsQuery.setType(1);
252   - System.out.println("查询出满足预产期前两周的孕妇："+patientsQuery.convertToQuery().convertToMongoQuery());
  252 + System.out.println("查询出满足预产期前两周的孕妇：" + patientsQuery.convertToQuery().convertToMongoQuery());
253 253 List<Patients> patientses = iPatientDao.queryPatient(patientsQuery.convertToQuery());
254 254 if (CollectionUtils.isNotEmpty(patientses)) {
255 255 logger.info("处理预产期前两周的孕妇数据，进入分娩住院追访 size:" + patientses.size());
... ... @@ -261,7 +261,7 @@
261 261 downRecordQuery.setParentId(trackDownRecord.getParentId());
262 262 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
263 263 //不存在追访或者追访未结束流程并且追访类型小于分娩住院
264   - 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())) {
  264 + 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())) {
265 265 trackDownRecord.setHospitalId(patient.getHospitalId());
266 266 trackDownRecord.setSource(patient.getId());
267 267 trackDownRecord.setStatus(1);
... ... @@ -287,7 +287,7 @@
287 287 handSieveTrack();
288 288  
289 289 //开始处理产检、产筛追访数据进入分娩追访
290   - // patientAutoFm();
  290 + patientAutoFm();
291 291  
292 292 //自动流转产后复查转出或产后访视转出
293 293 trackAutoFlow();
... ... @@ -307,7 +307,7 @@
307 307 downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.F.getId(), TrackDownDateEnums.G.getId(),
308 308 TrackDownDateEnums.K.getId()));
309 309 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
310   - System.out.println("开始处理产后复查、产后访视追访数据:"+records.size());
  310 + System.out.println("开始处理产后复查、产后访视追访数据:" + records.size());
311 311 for (TrackDownRecord tr : records) {
312 312 Patients patients = iPatientDao.getPatient(tr.getParentId());
313 313 if (patients != null && patients.getFmDate() != null) {//分娩时间不为空
314 314  
... ... @@ -321,10 +321,10 @@
321 321 tr.setTrackType(TrackDownDateEnums.J.getId());
322 322 }
323 323 }
324   - }else{//不显示
  324 + } else {//不显示
325 325 tr.setStatus(0);
326 326 }
327   - }else if (patients == null){
  327 + } else if (patients == null) {
328 328 tr.setStatus(0);
329 329 }
330 330 trackDownRecordService.updateTrackDown(tr, tr.getId());
331 331  
... ... @@ -340,11 +340,11 @@
340 340 TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
341 341 downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.C.getId(), TrackDownDateEnums.D.getId(), TrackDownDateEnums.H.getId(), TrackDownDateEnums.I.getId()));
342 342 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
343   - System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+records.size());
  343 + System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + records.size());
344 344 for (TrackDownRecord tr : records) {
345 345 Patients patients = iPatientDao.getPatient(tr.getParentId());
346 346 if (patients != null && patients.getType() == 3) {//产妇
347   - System.out.println("产检追访已经分娩："+patients.getId());
  347 + System.out.println("产检追访已经分娩：" + patients.getId());
348 348 //分娩距当前时间天数
349 349 int day = DateUtil.daysBetween(patients.getFmDate(), new Date());
350 350 if (day <= 60) {//产后60天内，可做产后访视或产后复查环节
... ... @@ -353,8 +353,8 @@
353 353 } else {
354 354 tr.setTrackType(TrackDownDateEnums.F.getId());
355 355 }
356   - }else{//否则不显示
357   - System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+patients.getId());
  356 + } else {//否则不显示
  357 + System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + patients.getId());
358 358 tr.setStatus(0);
359 359 }
360 360 trackDownRecordService.updateTrackDown(tr, tr.getId());
... ... @@ -377,13 +377,15 @@
377 377 if (patients == null || tr == null) {
378 378 tr.setStatus(0);
379 379 System.out.println("处理产筛追访数据，孕周大于20周自动进入产检追访:patient为空" + tr.getParentId());
380   - }else {
381   - int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
382   - if (week > 20) {//不能做产前筛查追访，显示产前检查追访
383   - if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
384   - tr.setTrackType(TrackDownDateEnums.I.getId());
385   - } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
386   - tr.setTrackType(TrackDownDateEnums.E.getId());
  380 + } else {
  381 + if (patients.getLastMenses() != null) {
  382 + int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
  383 + if (week > 20) {//不能做产前筛查追访，显示产前检查追访
  384 + if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
  385 + tr.setTrackType(TrackDownDateEnums.I.getId());
  386 + } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
  387 + tr.setTrackType(TrackDownDateEnums.E.getId());
  388 + }
387 389 }
388 390 }
389 391 }
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java View file @ f96f38d
... ... @@ -740,15 +740,15 @@
740 740 // }
741 741 // }
742 742 String gongGao = "";
743   - if(StringUtils.isNotEmpty(antExChuModel.getGonggao())){
  743 + if (StringUtils.isNotEmpty(antExChuModel.getGonggao())) {
744 744 gongGao = StringUtils.unitHandle(antExChuModel.getGonggao(), UnitConstants.CM);
745 745 }
746   - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()))){
747   - gongGao +=GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect());
  746 + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect()))) {
  747 + gongGao += GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoSelect());
748 748 }
749 749  
750   - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoType()))){
751   - gongGao +=GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType());
  750 + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExChuModel.getGonggaoType()))) {
  751 + gongGao += GongJingEnums.getHengZhiNameById(antExChuModel.getGonggaoType());
752 752 }
753 753 antChuJson.put("gongGao", gongGao);
754 754 //腹围
... ... @@ -943,6 +943,10 @@
943 943 //流产
944 944 antChuJson.put("abortion", abortion.toString());
945 945  
  946 + if (patients.getCardNo().equals("440101199905016942")) {
  947 + System.out.println("处理440101199905016942....");
  948 + }
  949 +
946 950 String ycNum = StringUtils.unitHandle(antExChuModel.getPregnancyTimes(), UnitConstants.CI);
947 951 String ccNum = StringUtils.unitHandle(antExChuModel.getProdTime(), UnitConstants.CI);
948 952 String lccNum = StringUtils.unitHandle(antExChuModel.getAbortion(), UnitConstants.CI);
... ... @@ -950,10 +954,17 @@
950 954  
951 955 //孕产史
952 956 antChuJson.put("hisGestation", "孕次:" +
953   - ycNum==null?"":ycNum + " 产次:" +
954   - ccNum==null?"":ccNum + " 流产次:" +
955   - lccNum==null?"":lccNum + " 存活胎儿数:" +
956   - chNum==null?"":chNum);
  957 + (ycNum == null ? "" : ycNum) + " 产次:" +
  958 + (ccNum == null ? "" : ccNum) + " 流产次:" +
  959 + (lccNum == null ? "" : lccNum) + " 存活胎儿数:" +
  960 + (chNum == null ? "" : chNum));
  961 +
  962 +
  963 + System.out.println("孕产史：" + "孕次:" +
  964 + (ycNum == null ? "" : ycNum) + " 产次:" +
  965 + (ccNum == null ? "" : ccNum) + " 流产次:" +
  966 + (lccNum == null ? "" : lccNum) + " 存活胎儿数:" +
  967 + (chNum == null ? "" : chNum));
957 968 try {
958 969 //国家高危+自定义高危
959 970 List highrisks = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
960 971  
... ... @@ -1104,9 +1115,9 @@
1104 1115 //诊断其他
1105 1116 antChuJson.put("diagnosisOther", antExChuModel.getDiagnosisOther());
1106 1117 //处理意见
1107   - if(StringUtils.isNotEmpty(antExChuModel.getTreatOpinion())){
  1118 + if (StringUtils.isNotEmpty(antExChuModel.getTreatOpinion())) {
1108 1119 antChuJson.put("treatOpinion", antExChuModel.getTreatOpinion());
1109   - }else{
  1120 + } else {
1110 1121 antChuJson.put("treatOpinion", getTreatmentOpinion3(antExChuModel.getTreatmentOpinion2()));
1111 1122 }
1112 1123 //指导意见
1113 1124  
1114 1125  
... ... @@ -1454,15 +1465,15 @@
1454 1465  
1455 1466  
1456 1467 String gongGao = "";
1457   - if(StringUtils.isNotEmpty(antExFuModel.getGongGao())){
  1468 + if (StringUtils.isNotEmpty(antExFuModel.getGongGao())) {
1458 1469 gongGao = StringUtils.unitHandle(antExFuModel.getGongGao(), UnitConstants.CM);
1459 1470 }
1460   - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()))){
1461   - gongGao +=GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect());
  1471 + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect()))) {
  1472 + gongGao += GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoSelect());
1462 1473 }
1463 1474  
1464   - if(StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoType()))){
1465   - gongGao +=GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType());
  1475 + if (StringUtils.isNotEmpty(GongJingEnums.getGongGaoNameById(antExFuModel.getGongGaoType()))) {
  1476 + gongGao += GongJingEnums.getHengZhiNameById(antExFuModel.getGongGaoType());
1466 1477 }
1467 1478 antFuJson.put("gongGao", gongGao);
1468 1479  
1469 1480  
... ... @@ -1542,9 +1553,9 @@
1542 1553 //指导意见其他
1543 1554 antFuJson.put("diagnosisOther", antExFuModel.getDiagnosisOther());
1544 1555 //处理意见
1545   - if(StringUtils.isNotEmpty(antExFuModel.getTreatmentOpinion())){
  1556 + if (StringUtils.isNotEmpty(antExFuModel.getTreatmentOpinion())) {
1546 1557 antFuJson.put("treatOpinion", antExFuModel.getTreatmentOpinion());
1547   - }else{
  1558 + } else {
1548 1559 antFuJson.put("treatOpinion", getTreatmentOpinion3(antExFuModel.getTreatmentOpinion2()));
1549 1560 }
1550 1561 antFuJson.put("checkDoctor", checkDoctor);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ f96f38d
... ... @@ -52,7 +52,13 @@
52 52  
53 53 public void export(TrackDownQueryRequest downQueryRequest, Integer userId,HttpServletResponse response) {
54 54 //转换为本地的查询条件
55   - TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  55 + //转换为本地的查询条件
  56 + TrackDownRecordQuery downRecordQuery;
  57 + try {
  58 + downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  59 + }catch (Exception e){
  60 + return ;
  61 + }
56 62 //不分页
57 63 downRecordQuery.setNeed(null);
58 64  
... ... @@ -270,7 +276,7 @@
270 276 * @param downQueryRequest
271 277 * @return
272 278 */
273   - private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) {
  279 + private TrackDownRecordQuery convertNaviteQuery(TrackDownQueryRequest downQueryRequest, Integer userId) throws Exception{
274 280  
275 281 boolean isPatient = false;
276 282 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -349,6 +355,9 @@
349 355 patientsQuery.setQueryNo(downQueryRequest.getKey());
350 356 System.out.println("过滤条件："+patientsQuery.convertToQuery().convertToMongoQuery());
351 357 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
  358 + if(CollectionUtils.isEmpty(patientses)){
  359 + throw new Exception("没有找到数据");
  360 + }
352 361 List<String> pids = new ArrayList<>();
353 362 for (Patients ps : patientses) {
354 363 pids.add(ps.getId());
... ... @@ -531,7 +540,12 @@
531 540 */
532 541 public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) {
533 542 //转换为本地的查询条件
534   - TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  543 + TrackDownRecordQuery downRecordQuery;
  544 + try {
  545 + downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
  546 + }catch (Exception e){
  547 + return new BaseObjectResponse();
  548 + }
535 549 List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
536 550 List<Map> data = new ArrayList<>();
537 551 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());