jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eca2b0467428250fdc99350591c1b4e5f52bba2b

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

多产程，电子病历

Showing 3 changed files with 384 additions and 257 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ eca2b04
... ... @@ -329,7 +329,7 @@
329 329 List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
330 330 for (TrackDownRecord tr : records) {
331 331 Patients patients = iPatientDao.getPatient(tr.getParentId());
332   - if(patients == null){
  332 + if(patients == null||tr==null){
333 333 System.out.println("处理产筛追访数据，孕周大于20周自动进入产检追访:patient为空"+tr.getParentId());
334 334 continue;
335 335 }
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ eca2b04
... ... @@ -9,7 +9,7 @@
9 9 import java.util.Map;
10 10  
11 11 /**
12   - * 产前检查
  12 + * 产前检查(复诊)
13 13 *
14 14 * Created by Administrator on 2016/6/16 0016.
15 15 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ eca2b04
... ... @@ -263,7 +263,7 @@
263 263 * @param antExAddRequest
264 264 * @return
265 265 */
266   - public BaseResponse addOneAntEx(final AntExAddRequest antExAddRequest, Integer userId) {
  266 + public BaseResponse addOneAntEx(final AntExAddRequest antExAddRequest, Integer userId) {
267 267 final String hospitalId = autoMatchFacade.getHospitalId(userId);
268 268 AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
269 269 //表示区域的
... ... @@ -384,7 +384,6 @@
384 384 });
385 385  
386 386  
387   -
388 387 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加复诊");
389 388  
390 389 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
... ... @@ -416,7 +415,7 @@
416 415 }
417 416 }
418 417 //添加复诊时添加追访信息
419   - addTrackDownInfo(userId,patients);
  418 + addTrackDownInfo(userId, patients);
420 419 }
421 420 //处理自定义高危状态为已使用状态
422 421 highRiskFacade.dispHospHighRiskUse(model.getOtherRisk());
... ... @@ -454,7 +453,7 @@
454 453 * @param excAddRequest
455 454 * @return
456 455 */
457   - public BaseResponse addOneAnetExChu(final AntExcAddRequest excAddRequest, final Integer userId) {
  456 + public BaseResponse addOneAnetExChu(final AntExcAddRequest excAddRequest, final Integer userId) {
458 457 StopWatch stopWatch = new StopWatch("addOneAnetExChu");
459 458  
460 459 final String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -564,7 +563,7 @@
564 563 commonThreadPool.execute(new Runnable() {
565 564 @Override
566 565 public void run() {
567   - // stopWatch.stop();
  566 + // stopWatch.stop();
568 567 /** 把优惠券设置为已使用状态 */
569 568 //stopWatch.start("couponService.use");
570 569 couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, chuId);
... ... @@ -622,7 +621,7 @@
622 621 }
623 622 }
624 623 //初诊是添加追访记录
625   - addTrackDownInfo(userId,patients);
  624 + addTrackDownInfo(userId, patients);
626 625 } else {
627 626 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊");
628 627 }
... ... @@ -634,6 +633,7 @@
634 633  
635 634 /**
636 635 * 初诊、复诊添加或更新追访信息
  636 + *
637 637 * @param userId
638 638 * @param patient
639 639 */
640 640  
641 641  
642 642  
643 643  
644 644  
645 645  
646 646  
647 647  
648 648  
649 649  
650 650  
651 651  
652 652  
653 653  
654 654  
655 655  
656 656  
657 657  
658 658  
... ... @@ -927,243 +927,249 @@
927 927 List<SortIn> listDate = new ArrayList();
928 928  
929 929 if (CollectionUtils.isNotEmpty(list)) {
930   -// Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false);
931 930 Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId, true), -1, true, exListQueryRequest.getPid(), false);
932 931 antexListResult.convertToResult(null, patients2, null);
933 932  
934 933 HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
935 934 antexListResult.setRiskFactor(highScoreResult.getHighRisk());
936 935 antexListResult.setRiskScore(highScoreResult.getScoreStr());
937   -
938   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
939   - matDeliverQuery.setPid(list.get(0).getPid());
940   - matDeliverQuery.setYn(YnEnums.YES.getId());
941   - //分娩记录
942   - List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery);
943   - for (MaternalDeliverModel model : modelList) {
944   - listDate.add(new SortIn(model));
945   - map.put(model.getId(), model);
946   - }
947   - //终止妊娠记录
948   - StopPregQuery query = new StopPregQuery();
949   - query.setYn(YnEnums.YES.getId());
950   - query.setPid(list.get(0).getPid());
951   - List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query);
952   - for (StopPregModel stopPregModel : stopPregs) {
953   - listDate.add(new SortIn(stopPregModel));
954   - map.put(stopPregModel.getId(), stopPregModel);
955   - }
956   - //排序集合
957 936 sortList(listDate);
  937 + distPatientData(list, sortList);
  938 + }
  939 + antexListResult.setData(sortList);
  940 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
958 941  
959   - //需要过滤掉建档就分娩的情况
960   - Date dueDate = null;
961   - if (CollectionUtils.isNotEmpty(listDate)) {
962   - String pid = "";
963   - int count = 0;
964   - for (int i = 0; i < listDate.size(); i++) {
965   - dueDate = listDate.get(i).getDate();
966   - Date end = new Date(listDate.get(i).getDate().getTime() + 86398000);
967   - List listData = new ArrayList();
968   - Organization organization = null;
969   - PatientsQuery patientsQuery1 = new PatientsQuery();
970   - patientsQuery1.setLastMensesEnd(end);
971   - patientsQuery1.setBuildType(1);
972   - patientsQuery1.setYn(YnEnums.YES.getId());
973   - //在区域组的时候不用查询隐藏档案
974   - if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
975   - patientsQuery1.setExtEnable(false);
976   - }
  942 + // MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  943 + // matDeliverQuery.setPid(list.get(0).getPid());
  944 + // matDeliverQuery.setYn(YnEnums.YES.getId());
  945 + // //分娩记录
  946 + // List<MaternalDeliverModel> modelList = matDeliverService.query(matDeliverQuery);
  947 + // for (MaternalDeliverModel model : modelList) {
  948 + // listDate.add(new SortIn(model));
  949 + // map.put(model.getId(), model);
  950 + // }
  951 + // //终止妊娠记录
  952 + // StopPregQuery query = new StopPregQuery();
  953 + // query.setYn(YnEnums.YES.getId());
  954 + // query.setPid(list.get(0).getPid());
  955 + // List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query);
  956 + // for (StopPregModel stopPregModel : stopPregs) {
  957 + // listDate.add(new SortIn(stopPregModel));
  958 + // map.put(stopPregModel.getId(), stopPregModel);
  959 + // }
  960 + // //排序集合
977 961  
978   - if (listDate.size() > i + 1) {
979   - patientsQuery1.setLastMensesStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000));
980   - }
981   - pid = list.get(0).getPid();
982   - patientsQuery1.setPid(pid);
983   - List<Patients> patientses = patientsService.queryPatient1(patientsQuery1, "created");
984   - if (CollectionUtils.isNotEmpty(patientses)) {
985   - count = count + patientses.size();
986   - //TODO 处理自动分娩的情况
987   - updateAutoMatdel(patientses, list, i, dueDate, sortList, listDate, map);
988   - listData = new ArrayList();
989   - }
  962 + // sort(listData);
  963 + // updateEditEnable(listData, sortList);
  964 + // sortList.add(listData);
990 965  
991   - if (CollectionUtils.isNotEmpty(patientses)) {
  966 + // Date dueDate = null;
  967 + //
  968 + // //有分娩记录或终止妊娠记录
  969 + // if (CollectionUtils.isNotEmpty(listDate)) {
  970 + // String pid = "";
  971 + // int count = 0;
  972 + // for (int i = 0; i < listDate.size(); i++) {
  973 + // dueDate = listDate.get(i).getDate();
  974 + // Date end = new Date(listDate.get(i).getDate().getTime() + 86398000);
  975 + // List listData = new ArrayList();
  976 + // Organization organization = null;
  977 + // PatientsQuery patientsQuery1 = new PatientsQuery();
  978 + // patientsQuery1.setLastMensesEnd(end);
  979 + // patientsQuery1.setBuildType(1);
  980 + // patientsQuery1.setYn(YnEnums.YES.getId());
  981 + // //在区域组的时候不用查询隐藏档案
  982 + // if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
  983 + // patientsQuery1.setExtEnable(false);
  984 + // }
  985 + //
  986 + // if (listDate.size() > i + 1) {
  987 + // patientsQuery1.setLastMensesStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000));
  988 + // }
  989 + // pid = list.get(0).getPid();
  990 + // patientsQuery1.setPid(pid);
  991 + // List<Patients> patientses = patientsService.queryPatient1(patientsQuery1, "created");
  992 + // if (CollectionUtils.isNotEmpty(patientses)) {
  993 + // count = count + patientses.size();
  994 + // //TODO 处理自动分娩或终止妊娠的情况
  995 + // updateAutoMatdel(patientses, list, i, dueDate, sortList, listDate, map);
  996 + // listData = new ArrayList();
  997 + // }
  998 + //
  999 + // if (CollectionUtils.isNotEmpty(patientses)) {
  1000 + //
  1001 + // List<SortIn> tmp = new ArrayList();
  1002 + // for (Patients patients : patientses) {
  1003 + // tmp.add(new SortIn(patients));
  1004 + // }
  1005 + // sortList(tmp);
  1006 + // Date min = null;
  1007 + // if (!tmp.isEmpty()) {
  1008 + // min = tmp.get(tmp.size() - 1).getDate();
  1009 + // }
  1010 + // //分娩前的数据,初诊、复诊、建档
  1011 + // buildPatientList(dueDate, patientses, listData, min, false);
992 1012  
993   - List<SortIn> tmp = new ArrayList();
994   - for (Patients patients : patientses) {
995   - tmp.add(new SortIn(patients));
996   - }
997   - sortList(tmp);
998   - Date min = null;
999   - if (!tmp.isEmpty()) {
1000   - min = tmp.get(tmp.size() - 1).getDate();
1001   - }
1002   - //分娩前的数据
1003   - buildPatientList(dueDate, patientses, listData, min, false);
1004 1013  
1005   - PostReviewQuery postReviewQuery = new PostReviewQuery();
1006   - postReviewQuery.setStart(dueDate);
1007   - if (i > 0) {
1008   - //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
1009   - postReviewQuery.setEnd(listDate.get(i - 1).getDate());
1010   - }
1011   - postReviewQuery.setPid(pid);
1012   - Object obj = map.get(listDate.get(i).getId());
1013   - if (obj instanceof MaternalDeliverModel) {
1014   - MaternalDeliverModel model = (MaternalDeliverModel) obj;
1015   - if (null != model.getHospitalId()) {
1016   - organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1017   - }
1018   - listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
1019   - } else if (obj instanceof StopPregModel) {
1020   - StopPregModel model = (StopPregModel) obj;
1021   - if (null != model.getHospitalId()) {
1022   - organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1023   - }
1024   - listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
1025   - }
  1014 + // Object obj = map.get(listDate.get(i).getId());
  1015 + // if (obj instanceof MaternalDeliverModel) {
  1016 + // MaternalDeliverModel model = (MaternalDeliverModel) obj;
  1017 + // if (null != model.getHospitalId()) {
  1018 + // organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
  1019 + // }
  1020 + // listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
  1021 + // } else if (obj instanceof StopPregModel) {
  1022 + // StopPregModel model = (StopPregModel) obj;
  1023 + // if (null != model.getHospitalId()) {
  1024 + // organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
  1025 + // }
  1026 + // listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
  1027 + // }
1026 1028  
  1029 +// //出院小结查询条件
  1030 +// DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
  1031 +// dischargeAbstractMotherQuery.setPid(pid);
  1032 +// dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId());
  1033 +// if (list.size() - 1 > i) {
  1034 +// dischargeAbstractMotherQuery.setStart(dueDate);
  1035 +// if (CollectionUtils.isNotEmpty(listDate)) {
  1036 +// //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
  1037 +// if (listDate.size() > 1 && i > 1) {
  1038 +// dischargeAbstractMotherQuery.setEnd(listDate.get(i - 1).getDate());
  1039 +// }
  1040 +// }
  1041 +// }
  1042 +// //出院小结信息
  1043 +// List<DischargeAbstractMotherModel> dischargeAbstractMotherModels = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery);
  1044 +// if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) {
  1045 +// for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) {
  1046 +// listData.add(new AntData(model, null != organization ? organization.getName() : "", dueDate));
  1047 +// }
  1048 +// }
  1049 +//
  1050 +// PostReviewQuery postReviewQuery = new PostReviewQuery();
  1051 +// postReviewQuery.setStart(dueDate);
  1052 +// if (i > 0) {
  1053 +// //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
  1054 +// postReviewQuery.setEnd(listDate.get(i - 1).getDate());
  1055 +// }
  1056 +// postReviewQuery.setPid(pid);
  1057 +// //产后复查记录
  1058 +// List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
  1059 +// if (CollectionUtils.isNotEmpty(reviewModels)) {
  1060 +// for (PostReviewModel postReviewModel : reviewModels) {
  1061 +// if (postReviewModel.getYn() == YnEnums.YES.getId()) {
  1062 +// if (null != postReviewModel.getHospitalId()) {
  1063 +// organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  1064 +// }
  1065 +// listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
  1066 +// }
  1067 +// }
  1068 +// }
  1069 +// }
  1070 +// if (!listData.isEmpty()) {
  1071 +// sort(listData);
  1072 +// updateEditEnable(listData, sortList);
  1073 +// sortList.add(listData);
  1074 +// // Collections.reverse(sortList);
  1075 +// }
  1076 +// }
  1077 +// if (list.size() > count) {
  1078 +// //分娩记录剩下的建档
  1079 +// PatientsQuery patientsQuery1 = new PatientsQuery();
  1080 +// patientsQuery1.setYn(YnEnums.YES.getId());
  1081 +// patientsQuery1.setPid(pid);
  1082 +// patientsQuery1.setLastMensesStart(new Date(listDate.get(0).getDate().getTime()));
  1083 +// patientsQuery1.setType(1);
  1084 +// patientsQuery1.setBuildType(1);
  1085 +// List<Patients> patientsList = patientsService.queryPatient(patientsQuery1);
  1086 +// List list1 = new ArrayList();
  1087 +// List<SortIn> tmp = new ArrayList();
  1088 +// for (Patients patients : patientsList) {
  1089 +// tmp.add(new SortIn(patients));
  1090 +// }
  1091 +// sortList(tmp);
  1092 +// Date min = null;
  1093 +// if (!tmp.isEmpty()) {
  1094 +// min = tmp.get(tmp.size() - 1).getDate();
  1095 +// }
  1096 +// List l = buildPatientList(new Date(), patientsList, list1, min, false);
  1097 +// if (!l.isEmpty()) {
  1098 +// sort(l);
  1099 +//
  1100 +// List list2 = new ArrayList();
  1101 +// list2.add(l);
  1102 +// list2.addAll(sortList);
  1103 +// sortList = list2;
  1104 +// updateEditEnable(l, sortList);
  1105 +// l = new ArrayList();
  1106 +// }
  1107 +// }
  1108 +//
  1109 +// } else { //没有终止的情况
  1110 +// List list1 = new ArrayList();
  1111 +// List<SortIn> tmp = new ArrayList();
  1112 +// for (Patients patients : list) {
  1113 +// tmp.add(new SortIn(patients));
  1114 +// }
  1115 +// int size = list.size();
  1116 +// sortList(tmp);
  1117 +// Date min = null;
  1118 +// if (!tmp.isEmpty()) {
  1119 +// min = tmp.get(tmp.size() - 1).getDate();
  1120 +// }
  1121 +// updateAutoMatdel(list, list, 0, dueDate, sortList, null, null);
  1122 +// if (size != list.size()) {
  1123 +// list1 = new ArrayList();
  1124 +// }
  1125 +// /*if(null==dueDate){
  1126 +// dueDate= new Date();
  1127 +// }*/
  1128 +// //TODO buildPatientList(dueDate, list, list1, min, false);
  1129 +// List l = buildPatientList(dueDate, list, list1, min, false);
  1130 +// if (!l.isEmpty()) {
  1131 +// sort(l);
  1132 +// updateEditEnable(l, sortList);
  1133 +// sortList.add(l);
  1134 +// }
  1135 +// }
1027 1136  
1028   - DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
1029   - dischargeAbstractMotherQuery.setPid(pid);
1030   - dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId());
1031   - if (list.size() - 1 > i) {
1032   - dischargeAbstractMotherQuery.setStart(dueDate);
1033   - if (CollectionUtils.isNotEmpty(listDate)) {
1034   - //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
1035   - if (listDate.size() > 1 && i > 1) {
1036   - dischargeAbstractMotherQuery.setEnd(listDate.get(i - 1).getDate());
1037   - }
1038   - }
1039   - }
1040   -
1041   - List<DischargeAbstractMotherModel> dischargeAbstractMotherModels = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery);
1042   -
1043   - if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) {
1044   - for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) {
1045   - listData.add(new AntData(model, null != organization ? organization.getName() : "", dueDate));
1046   - }
1047   - }
1048   -
1049   -
1050   - //产后复查记录
1051   - List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
1052   - if (CollectionUtils.isNotEmpty(reviewModels)) {
1053   - for (PostReviewModel postReviewModel : reviewModels) {
1054   - if (postReviewModel.getYn() == YnEnums.YES.getId()) {
1055   - if (null != postReviewModel.getHospitalId()) {
1056   - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
1057   - }
1058   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size() - 1).getFmDate()));
1059   - }
1060   - }
1061   - }
1062   - }
1063   - if (!listData.isEmpty()) {
1064   - sort(listData);
1065   - updateEditEnable(listData, sortList);
1066   - sortList.add(listData);
1067   -// Collections.reverse(sortList);
1068   - }
1069   - }
1070   - if (list.size() > count) {
1071   - //分娩记录剩下的建档
1072   - PatientsQuery patientsQuery1 = new PatientsQuery();
1073   - patientsQuery1.setYn(YnEnums.YES.getId());
1074   - patientsQuery1.setPid(pid);
1075   - patientsQuery1.setLastMensesStart(new Date(listDate.get(0).getDate().getTime()));
1076   - patientsQuery1.setType(1);
1077   - patientsQuery1.setBuildType(1);
1078   - List<Patients> patientsList = patientsService.queryPatient(patientsQuery1);
1079   - List list1 = new ArrayList();
1080   - List<SortIn> tmp = new ArrayList();
1081   - for (Patients patients : patientsList) {
1082   - tmp.add(new SortIn(patients));
1083   - }
1084   - sortList(tmp);
1085   - Date min = null;
1086   - if (!tmp.isEmpty()) {
1087   - min = tmp.get(tmp.size() - 1).getDate();
1088   - }
1089   - List l = buildPatientList(new Date(), patientsList, list1, min, false);
1090   - if (!l.isEmpty()) {
1091   - sort(l);
1092   -
1093   - List list2 = new ArrayList();
1094   - list2.add(l);
1095   - list2.addAll(sortList);
1096   - sortList = list2;
1097   - updateEditEnable(l, sortList);
1098   - l = new ArrayList();
1099   - }
1100   - }
1101   -
1102   - } else {
1103   - //没有终止的情况
1104   - List list1 = new ArrayList();
1105   - List<SortIn> tmp = new ArrayList();
1106   - for (Patients patients : list) {
1107   - tmp.add(new SortIn(patients));
1108   - }
1109   - int size = list.size();
1110   - sortList(tmp);
1111   - Date min = null;
1112   - if (!tmp.isEmpty()) {
1113   - min = tmp.get(tmp.size() - 1).getDate();
1114   - }
1115   - updateAutoMatdel(list, list, 0, dueDate, sortList, null, null);
1116   - if (size != list.size()) {
1117   - list1 = new ArrayList();
1118   - }
1119   - /*if(null==dueDate){
1120   - dueDate= new Date();
1121   - }*/
1122   - //TODO buildPatientList(dueDate, list, list1, min, false);
1123   - List l = buildPatientList(dueDate, list, list1, min, false);
1124   - if (!l.isEmpty()) {
1125   - sort(l);
1126   - updateEditEnable(l, sortList);
1127   - sortList.add(l);
1128   - }
1129   - }
1130   - }
1131   - antexListResult.setData(sortList);
1132   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
1133 1137 }
1134 1138  
1135 1139 /**
1136   - * 处理自动分娩的情况
  1140 + * 处理自动分娩或终止妊娠的情况
1137 1141 */
1138 1142 private void updateAutoMatdel(List<Patients> patientses, List<Patients> list, int i, Date dueDate, List sortList, List<SortIn> listDate, Map map) {
1139 1143 Iterator<Patients> iterator = patientses.iterator();
1140 1144 Organization organization = null;
1141 1145 String pid = "";
  1146 + String patientId = "";
1142 1147 List listData = new ArrayList();
1143 1148 Date lastMenses = null;//上一次的末次月经
  1149 + //遍历产程，只处理分娩或者终止妊娠的数据
1144 1150 while (iterator.hasNext()) {
1145 1151 Patients patients = iterator.next();
1146 1152  
1147   - //处理建档就分娩的情况
  1153 + //处理建档就分娩的情况，根据末次月经计算预产期
1148 1154 Date date = DateUtil.addWeek(patients.getLastMenses(), 42);
1149   -
  1155 + //获取当前时间的年月日
1150 1156 Date currentDate = DateUtil.formatDate(new Date());
1151   -
1152   -
  1157 + //如果当前时间小于预产期或者已经自动分娩，或者终止妊娠
1153 1158 if ((date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) || patients.getType() == 3 && patients.getFmDate() != null) {
1154 1159 //建档记录
1155 1160 if (null != patients.getHospitalId()) {
1156 1161 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1157 1162 }
  1163 + //获取personId
1158 1164 pid = patients.getPid();
  1165 + //获取产程ID
  1166 + patientId = patients.getId();
1159 1167 //当主档案的医院不在group组里需要显示本来的隐藏档案
1160 1168 if (!"2".equals(patients.getEnable())) {
1161 1169 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
1162 1170 }
1163 1171  
1164   -// if (null == dueDate && null != patients.getFmDate()) {
1165 1172 dueDate = patients.getFmDate();
1166   -// }
1167 1173  
1168 1174 //初诊记录
1169 1175 AntExChuQuery antExChuQuery = new AntExChuQuery();
1170 1176  
1171 1177  
... ... @@ -1175,23 +1181,23 @@
1175 1181 antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000));
1176 1182 }
1177 1183  
1178   - antExChuQuery.setPid(pid);
1179   -
  1184 + // antExChuQuery.setPid(pid);
  1185 + antExChuQuery.setParentId(patientId);
1180 1186 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
1181 1187 if (CollectionUtils.isNotEmpty(antExChuModels)) {
1182 1188 for (AntExChuModel an : antExChuModels) {
1183 1189 if (null != an.getHospitalId()) {
1184 1190 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
1185 1191 }
1186   -
1187   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
  1192 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
1188 1193 }
1189 1194 }
1190 1195  
1191 1196 //复诊记录
1192 1197 AntExQuery antExQuery = new AntExQuery();
1193 1198 antExQuery.setYn(YnEnums.YES.getId());
1194   - antExQuery.setPid(pid);
  1199 + // antExQuery.setPid(pid);
  1200 + antExQuery.setParentId(patientId);
1195 1201 antExQuery.setStart(patients.getBookbuildingDate());
1196 1202 if (null == patients.getFmDate()) {
1197 1203 antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000));
... ... @@ -1206,7 +1212,7 @@
1206 1212 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
1207 1213 }
1208 1214  
1209   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
  1215 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
1210 1216 }
1211 1217 }
1212 1218 /*
... ... @@ -1224,7 +1230,8 @@
1224 1230 if (null != map) {
1225 1231 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1226 1232 matDeliverQuery.setYn(YnEnums.YES.getId());
1227   - matDeliverQuery.setPid(pid);
  1233 + // matDeliverQuery.setPid(pid);
  1234 + matDeliverQuery.setParentId(patientId);
1228 1235 // matDeliverQuery.setNeStart(true);
1229 1236 // matDeliverQuery.setNeEnd(true);
1230 1237 matDeliverQuery.setCreatedStart(dueDate);
1231 1238  
... ... @@ -1243,12 +1250,13 @@
1243 1250 organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1244 1251 }
1245 1252  
1246   - listData.add(new AntData(model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
  1253 + listData.add(new AntData(model, patients.getLastMenses(), null != organization ? organization.getName() : ""));
1247 1254 }
1248 1255 }
1249 1256  
1250 1257 DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
1251   - dischargeAbstractMotherQuery.setPid(pid);
  1258 + // dischargeAbstractMotherQuery.setPid(pid);
  1259 + dischargeAbstractMotherQuery.setPatientId(patientId);
1252 1260 dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId());
1253 1261 if (list.size() - 1 > i) {
1254 1262 dischargeAbstractMotherQuery.setStart(dueDate);
... ... @@ -1272,7 +1280,8 @@
1272 1280 if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) {
1273 1281 StopPregQuery stopPregQuery = new StopPregQuery();
1274 1282 stopPregQuery.setYn(YnEnums.YES.getId());
1275   - stopPregQuery.setPid(pid);
  1283 + // stopPregQuery.setPid(pid);
  1284 + stopPregQuery.setPatientId(patientId);
1276 1285 if (list.size() - 1 > i) {
1277 1286 stopPregQuery.setStopDateStart(dueDate);
1278 1287 if (CollectionUtils.isNotEmpty(listDate)) {
... ... @@ -1310,7 +1319,8 @@
1310 1319 }
1311 1320 }
1312 1321 postReviewQuery.setYn(YnEnums.YES.getId());
1313   - postReviewQuery.setPid(pid);
  1322 + // postReviewQuery.setPid(pid);
  1323 + postReviewQuery.setParentId(patientId);
1314 1324  
1315 1325  
1316 1326 //产后复查记录
... ... @@ -1343,6 +1353,136 @@
1343 1353  
1344 1354  
1345 1355 /**
  1356 + * 处理产程数据
  1357 + */
  1358 + private void distPatientData(List<Patients> patientses, List sortList) {
  1359 + Iterator<Patients> iterator = patientses.iterator();
  1360 + Organization organization = null;
  1361 + String patientId = "";
  1362 + while (iterator.hasNext()) {
  1363 + List listData = new ArrayList();
  1364 + Patients patients = iterator.next();
  1365 + //建档记录
  1366 + if (null != patients.getHospitalId()) {
  1367 + organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
  1368 + }
  1369 + //获取产程ID
  1370 + patientId = patients.getId();
  1371 + //当主档案的医院不在group组里需要显示本来的隐藏档案
  1372 + if (!"2".equals(patients.getEnable())) {
  1373 + listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
  1374 + }
  1375 +
  1376 + //初诊记录
  1377 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  1378 + antExChuQuery.setYn(YnEnums.YES.getId());
  1379 + antExChuQuery.setStart(patients.getBookbuildingDate());
  1380 + if (null == patients.getFmDate()) {
  1381 + antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000));
  1382 + } else {
  1383 + antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000));
  1384 + }
  1385 + antExChuQuery.setParentId(patientId);
  1386 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  1387 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  1388 + for (AntExChuModel an : antExChuModels) {
  1389 + if (null != an.getHospitalId()) {
  1390 + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  1391 + }
  1392 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1393 + }
  1394 + }
  1395 +
  1396 + //复诊记录
  1397 + AntExQuery antExQuery = new AntExQuery();
  1398 + antExQuery.setYn(YnEnums.YES.getId());
  1399 + antExQuery.setParentId(patientId);
  1400 + antExQuery.setStart(patients.getBookbuildingDate());
  1401 + if (null == patients.getFmDate()) {
  1402 + antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000));
  1403 + } else {
  1404 + antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000));
  1405 + }
  1406 +
  1407 + List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
  1408 + if (CollectionUtils.isNotEmpty(list1)) {
  1409 + for (AntenatalExaminationModel an : list1) {
  1410 + if (null != an.getHospitalId()) {
  1411 + organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
  1412 + }
  1413 +
  1414 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  1415 + }
  1416 + }
  1417 + //分娩记录
  1418 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  1419 + matDeliverQuery.setYn(YnEnums.YES.getId());
  1420 + matDeliverQuery.setParentId(patientId);
  1421 + List<MaternalDeliverModel> l = matDeliverService.query(matDeliverQuery);
  1422 + if (CollectionUtils.isNotEmpty(l)) {
  1423 + MaternalDeliverModel model = l.get(0);
  1424 + if (null != model.getHospitalId()) {
  1425 + organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
  1426 + }
  1427 +
  1428 + listData.add(new AntData(model, patients.getLastMenses(), null != organization ? organization.getName() : ""));
  1429 + }
  1430 + //出院小结
  1431 + DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
  1432 + dischargeAbstractMotherQuery.setPatientId(patientId);
  1433 + dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId());
  1434 + List<DischargeAbstractMotherModel> dischargeAbstractMotherModels = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery);
  1435 +
  1436 + if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) {
  1437 + for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) {
  1438 + listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate()));
  1439 + }
  1440 + }
  1441 +
  1442 + //终止妊娠的情况
  1443 + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) {
  1444 + StopPregQuery stopPregQuery = new StopPregQuery();
  1445 + stopPregQuery.setYn(YnEnums.YES.getId());
  1446 + stopPregQuery.setPatientId(patientId);
  1447 + List<StopPregModel> models = stopPregnancyService.queryStopPreg(stopPregQuery);
  1448 + if (CollectionUtils.isNotEmpty(models)) {
  1449 + for (StopPregModel stop : models) {
  1450 + if (null != stop.getHospitalId()) {
  1451 + organization = organizationService.getOrganization(Integer.valueOf(stop.getHospitalId()));
  1452 + }
  1453 + listData.add(new AntData(stop, patients.getLastMenses(), null != organization ? organization.getName() : ""));
  1454 + }
  1455 + }
  1456 + } else {
  1457 + PostReviewQuery postReviewQuery = new PostReviewQuery();
  1458 + postReviewQuery.setYn(YnEnums.YES.getId());
  1459 + postReviewQuery.setParentId(patientId);
  1460 +
  1461 + //产后复查记录
  1462 + List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
  1463 + if (CollectionUtils.isNotEmpty(reviewModels)) {
  1464 + if (CollectionUtils.isNotEmpty(listData)) {
  1465 + for (PostReviewModel postReviewModel : reviewModels) {
  1466 + if (postReviewModel.getYn() == YnEnums.YES.getId()) {
  1467 + if (null != postReviewModel.getHospitalId()) {
  1468 + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  1469 + }
  1470 +
  1471 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patients.getFmDate()));
  1472 + }
  1473 + }
  1474 + }
  1475 + }
  1476 + }
  1477 + if (CollectionUtils.isNotEmpty(listData)) {
  1478 + sort(listData);
  1479 + updateEditEnable(listData, sortList);
  1480 + sortList.add(listData);
  1481 + }
  1482 + }
  1483 + }
  1484 +
  1485 + /**
1346 1486 * 修改按钮控制
1347 1487 *
1348 1488 * @param list 同一产程记录
... ... @@ -1356,7 +1496,7 @@
1356 1496 antData.setEnableEdit("0");
1357 1497 }
1358 1498 }
1359   - //如果最后一条是复查 4 5 6 分娩 复查 终止妊娠
  1499 + //如果最后一条是复查 4 5 6 分娩 产后复查 终止妊娠
1360 1500 if ("4567".indexOf(list.get(list.size() - 1).getType()) > -1) {
1361 1501 for (int i = 0; i < list.size() - 1; i++) {
1362 1502 list.get(i).setEnableEdit("0");
... ... @@ -1493,7 +1633,6 @@
1493 1633 }
1494 1634  
1495 1635  
1496   -
1497 1636 public class SortIn {
1498 1637  
1499 1638 public SortIn(Patients patients) {
... ... @@ -1800,8 +1939,8 @@
1800 1939 HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
1801 1940 patients1.setRiskScore(highScoreResult.getScore());
1802 1941 patients1.setRiskFactorId(highScoreResult.getHighId());
1803   - List list =highScoreResult.getLevelId();
1804   - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(list,true);
  1942 + List list = highScoreResult.getLevelId();
  1943 + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(list, true);
1805 1944 patients1.setRiskLevelId(JsonUtil.array2JsonString(list));
1806 1945 //设置其他的高危因素
1807 1946 patients1.setoRiskFactor(StringUtils.isNotEmpty(highScoreResult.getOtherRisk()) ? highScoreResult.getOtherRisk() : "");
1808 1947  
... ... @@ -1969,13 +2108,14 @@
1969 2108 matDeliverQuery.setPid(patients.getPid());
1970 2109 matDeliverQuery.setYn(YnEnums.YES.getId());
1971 2110  
  2111 + //查询分娩记录
1972 2112 List<MaternalDeliverModel> list1 = matDeliverService.query(matDeliverQuery);
1973 2113  
1974 2114 StopPregQuery stopPregQuery = new StopPregQuery();
1975 2115  
1976 2116 stopPregQuery.setPid(patients.getPid());
1977 2117 stopPregQuery.setYn(YnEnums.YES.getId());
1978   -
  2118 + //查询终止妊娠
1979 2119 List<StopPregModel> list2 = stopPregnancyService.queryStopPreg(stopPregQuery);
1980 2120  
1981 2121  
... ... @@ -2003,6 +2143,8 @@
2003 2143 max = new Date(sortList.get(0).getDate().getTime() + 400000);
2004 2144 }
2005 2145 antExChuQuery.setStart(max);
  2146 +
  2147 + // System.out.println("初诊查询："+antExChuQuery.convertToQuery().convertToMongoQuery());
2006 2148 //获取初诊记录
2007 2149 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
2008 2150  
... ... @@ -2027,6 +2169,7 @@
2027 2169 antExQuery1.setPid(patients.getPid());
2028 2170 antExQuery1.setYn(YnEnums.YES.getId());
2029 2171 antExQuery1.setStart(max);
  2172 + // System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery());
2030 2173 List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
2031 2174  
2032 2175 String lastTime = "";
2033 2176  
2034 2177  
... ... @@ -2090,19 +2233,16 @@
2090 2233 }
2091 2234  
2092 2235  
2093   - if (patients != null)
2094   - {
  2236 + if (patients != null) {
2095 2237  
2096 2238 //测量数据
2097   - antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(),patients.getCardNo(),hospitalId));
  2239 + antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(), patients.getCardNo(), hospitalId));
2098 2240  
2099 2241 //产筛状态
2100 2242 antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId));
2101 2243 }
2102 2244  
2103 2245  
2104   -
2105   -
2106 2246 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
2107 2247 }
2108 2248  
2109 2249  
2110 2250  
2111 2251  
2112 2252  
2113 2253  
2114 2254  
... ... @@ -2555,41 +2695,35 @@
2555 2695  
2556 2696 public BaseResponse getGongGaoLine(String patientId, Integer id) {
2557 2697  
2558   - Map<String,Object> map = new HashMap<>();
  2698 + Map<String, Object> map = new HashMap<>();
2559 2699  
2560 2700 List<String> titles = new ArrayList<>();
2561 2701 List<String> values = new ArrayList<>();
2562 2702  
2563 2703  
2564   - List<Map<String,String>> tables = new LinkedList<>();
  2704 + List<Map<String, String>> tables = new LinkedList<>();
2565 2705  
2566 2706 AntExChuQuery antExChuQuery = new AntExChuQuery();
2567 2707 antExChuQuery.setYn(YnEnums.YES.getId());
2568 2708 antExChuQuery.setParentId(patientId);
2569 2709 List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
2570   - if (CollectionUtils.isNotEmpty(antExChuModels))
2571   - {
  2710 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
2572 2711 AntExChuModel chumodel = antExChuModels.get(0);
2573   - if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect()))
2574   - {
2575   - Map<String,String> item = new HashMap<>();
  2712 + if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) {
  2713 + Map<String, String> item = new HashMap<>();
2576 2714 String value = "";
2577   - if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect()) )
2578   - {
  2715 + if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) {
2579 2716 if (StringUtils.isNotEmpty(chumodel.getGonggaoType())) {
2580 2717 value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(chumodel.getGonggaoType());
2581 2718 } else {
2582 2719 value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect());
2583 2720 }
2584   - }
2585   - else if (StringUtils.isNotEmpty(chumodel.getGonggao()))
2586   - {
  2721 + } else if (StringUtils.isNotEmpty(chumodel.getGonggao())) {
2587 2722 value = chumodel.getGonggao();
2588 2723 }
2589 2724 item.put("value", value);
2590 2725 item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime()));
2591   - if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches()))
2592   - {
  2726 + if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches())) {
2593 2727 titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime()));
2594 2728 values.add(chumodel.getGonggao());
2595 2729 }
2596 2730  
2597 2731  
2598 2732  
... ... @@ -2602,32 +2736,25 @@
2602 2736 antExQuery.setParentId(patientId);
2603 2737 antExQuery.setYn(YnEnums.YES.getId());
2604 2738 List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created"));
2605   - if (CollectionUtils.isNotEmpty(examinationModelList))
2606   - {
2607   - for (AntenatalExaminationModel anmodel : examinationModelList)
2608   - {
2609   - if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect()))
2610   - {
2611   - Map<String,String> item = new HashMap<>();
  2739 + if (CollectionUtils.isNotEmpty(examinationModelList)) {
  2740 + for (AntenatalExaminationModel anmodel : examinationModelList) {
  2741 + if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) {
  2742 + Map<String, String> item = new HashMap<>();
2612 2743  
2613 2744 String value = "";
2614   - if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect()) )
2615   - {
  2745 + if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) {
2616 2746 if (StringUtils.isNotEmpty(anmodel.getGongGaoType())) {
2617 2747 value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(anmodel.getGongGaoType());
2618 2748 } else {
2619 2749 value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect());
2620 2750 }
2621   - }
2622   - else if (StringUtils.isNotEmpty(anmodel.getGongGao()))
2623   - {
  2751 + } else if (StringUtils.isNotEmpty(anmodel.getGongGao())) {
2624 2752 value = anmodel.getGongGao();
2625 2753 }
2626 2754  
2627 2755 item.put("value", value);
2628 2756 item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate()));
2629   - if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches()))
2630   - {
  2757 + if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches())) {
2631 2758 titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate()));
2632 2759 values.add(anmodel.getGongGao());
2633 2760 }