jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fa5ac74d1d9cbe63bd3a04dbf0db93ba9e1c2af9

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

秦皇岛基本公卫接口修改

Showing 1 changed file with 72 additions and 43 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java View file @ fa5ac74
... ... @@ -194,20 +194,25 @@
194 194 * @return
195 195 */
196 196 public List<Map<String,String>> getChuZhen(String startDate,String endDate){
  197 + List<AntExChuModel> allList = null;
197 198 List<AntExChuModel> list = null;
  199 + List<AntExChuModel> list1 = null;
198 200 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
199 201 AntExChuQuery antExChuQuery1 = new AntExChuQuery();
200 202 antExChuQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
201 203 antExChuQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
202 204 list = antExService.queryAntExChu(antExChuQuery1);
203   - if(list == null || list.size() == 0){
204   - AntExChuQuery antExChuQuery = new AntExChuQuery();
205   - antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
206   - antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
207   - list = antExService.queryAntExChu(antExChuQuery);
  205 +
  206 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  207 + antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  208 + antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  209 + list1 = antExService.queryAntExChu(antExChuQuery);
  210 + if((list != null && list.size() > 0) || (list1 != null && list1.size() > 0)){
  211 + allList.addAll(list);
  212 + allList.addAll(list1);
208 213 }
209   - if(list != null && list.size() > 0){
210   - for(AntExChuModel antExChuModel : list){
  214 + if(allList != null && allList.size() > 0){
  215 + for(AntExChuModel antExChuModel : allList){
211 216 try{
212 217 Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId());
213 218 if("2100001705".equals(patients.getHospitalId())){
214 219  
215 220  
... ... @@ -498,20 +503,25 @@
498 503 * @return
499 504 */
500 505 public List<Map<String,String>> getFuZhen(String startDate,String endDate){
  506 + List<AntenatalExaminationModel> allList = null;
  507 + List<AntenatalExaminationModel> list1 = null;
501 508 List<AntenatalExaminationModel> list = null;
502 509 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
503 510 AntExQuery antExQuery1 = new AntExQuery();
504 511 antExQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
505 512 antExQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
506 513 list = antExService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
507   - if(null == list || list.size() == 0){
508   - AntExQuery antExQuery = new AntExQuery();
509   - antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
510   - antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
511   - list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  514 +
  515 + AntExQuery antExQuery = new AntExQuery();
  516 + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  517 + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  518 + list1 = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  519 + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){
  520 + allList.addAll(list);
  521 + allList.addAll(list1);
512 522 }
513   - if(list != null && list.size() > 0){
514   - for(AntenatalExaminationModel data : list){
  523 + if(allList != null && allList.size() > 0){
  524 + for(AntenatalExaminationModel data : allList){
515 525 try{
516 526 Patients patients = patientsService.findOnePatientById(data.getParentId());
517 527 if("2100001705".equals(patients.getHospitalId())){
518 528  
519 529  
... ... @@ -859,21 +869,26 @@
859 869 * @return
860 870 */
861 871 public List<Map<String,String>> getXse(String startDate,String endDate){
  872 + List<BabyModel> allModels = null;
  873 + List<BabyModel> models1 = null;
862 874 List<BabyModel> models = null;
863 875 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
864 876 BabyModelQuery babyQuery1 = new BabyModelQuery();
865 877 babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
866 878 babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
867 879 models = babyBookbuildingService.queryBabyBuildByCond(babyQuery1);
868   - if(null == models || models.size() == 0){
869   - BabyModelQuery babyQuery = new BabyModelQuery();
870   - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
871   - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
872   - babyQuery.setYn(YnEnums.YES.getId());
873   - models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  880 +
  881 + BabyModelQuery babyQuery = new BabyModelQuery();
  882 + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  883 + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  884 + babyQuery.setYn(YnEnums.YES.getId());
  885 + models1 = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  886 + if((null != models && models.size() > 0) || (null != models1 && models1.size() > 0)){
  887 + allModels.addAll(models);
  888 + allModels.addAll(models1);
874 889 }
875   - if(models != null && models.size() > 0){
876   - for(BabyModel babyModel : models){
  890 + if(allModels != null && allModels.size() > 0){
  891 + for(BabyModel babyModel : allModels){
877 892 try{
878 893 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
879 894 if("2100001705".equals(patients.getHospitalId())){
880 895  
881 896  
882 897  
... ... @@ -939,21 +954,26 @@
939 954 * @return
940 955 */
941 956 public List<Map<String,String>> getChfs(String startDate,String endDate){
  957 + List<MatdeliverFollowModel> allList = null;
  958 + List<MatdeliverFollowModel> list1 = null;
942 959 List<MatdeliverFollowModel> list = null;
943 960 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
944 961 MatDeliverFollowQuery deliverQuery1 = new MatDeliverFollowQuery();
945 962 deliverQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
946 963 deliverQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
947 964 list = matDeliverFollowService.query(deliverQuery1);
948   - if(null == list || list.size() == 0){
949   - MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery();
950   - deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate));
951   - deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate));
952   - list = matDeliverFollowService.query(deliverQuery);
  965 +
  966 + MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery();
  967 + deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate));
  968 + deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate));
  969 + list1 = matDeliverFollowService.query(deliverQuery);
  970 + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){
  971 + allList.addAll(list);
  972 + allList.addAll(list1);
953 973 }
954   - if(list != null && list.size() > 0){
  974 + if(allList != null && allList.size() > 0){
955 975  
956   - for(MatdeliverFollowModel data : list){
  976 + for(MatdeliverFollowModel data : allList){
957 977 try{
958 978 Map<String,String> map = new HashMap<String,String>();
959 979 //根据分娩ID查询孕妇基本信息
960 980  
961 981  
... ... @@ -1077,20 +1097,24 @@
1077 1097 * @return
1078 1098 */
1079 1099 public List<Map<String,String>> getCh42fs(String startDate,String endDate){
  1100 + List<PostReviewModel> allList = null;
  1101 + List<PostReviewModel> list1 = null;
1080 1102 List<PostReviewModel> list = null;
1081 1103 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
1082 1104 PostReviewQuery mongoQuery1 = new PostReviewQuery();
1083 1105 mongoQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
1084 1106 mongoQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
1085 1107 list = postReviewService.findWithList(mongoQuery1);
1086   - if(null == list || list.size() == 0){
1087   - PostReviewQuery mongoQuery = new PostReviewQuery();
1088   - mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
1089   - mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
1090   - list = postReviewService.findWithList(mongoQuery);
  1108 +
  1109 + PostReviewQuery mongoQuery = new PostReviewQuery();
  1110 + mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  1111 + mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  1112 + list1 = postReviewService.findWithList(mongoQuery);
  1113 + if((null != list && list.size() > 0) && (null != list1 && list1.size() > 0)){
  1114 +
1091 1115 }
1092   - if(list != null && list.size() > 0){
1093   - for(PostReviewModel data : list){
  1116 + if(allList != null && allList.size() > 0){
  1117 + for(PostReviewModel data : allList){
1094 1118 try{
1095 1119 Patients patients = patientsService.findOnePatientById(data.getParentId());
1096 1120 if("2100001705".equals(patients.getHospitalId())){
1097 1121  
1098 1122  
... ... @@ -1524,20 +1548,25 @@
1524 1548 * @return
1525 1549 */
1526 1550 public List<Map<String,String>> getEb(String startDate,String endDate){
  1551 + List<BabyCheckModel> allList = null;
  1552 + List<BabyCheckModel> list1 = null;
1527 1553 List<BabyCheckModel> list = null;
1528 1554 List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
1529 1555 BabyCheckModelQuery babyQuery1 = new BabyCheckModelQuery();
1530 1556 babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
1531 1557 babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
1532 1558 list = babyCheckService.queryBabyCheckRecord(babyQuery1);
1533   - if(null == list || list.size() == 0){
1534   - BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
1535   - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
1536   - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
1537   - list = babyCheckService.queryBabyCheckRecord(babyQuery);
  1559 +
  1560 + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
  1561 + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  1562 + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  1563 + list1 = babyCheckService.queryBabyCheckRecord(babyQuery);
  1564 + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){
  1565 + allList.addAll(list);
  1566 + allList.addAll(list1);
1538 1567 }
1539   - if(list != null && list.size() > 0){
1540   - for(BabyCheckModel babyCheckModel : list){
  1568 + if(allList != null && allList.size() > 0){
  1569 + for(BabyCheckModel babyCheckModel : allList){
1541 1570 try{
1542 1571 Map<String,String> map = new HashMap<String,String>();
1543 1572 BabyModelQuery babymQuery = new BabyModelQuery();