jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 947f00c70a4e0c9c2c75c9c85ee73316677f2377

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

秦皇岛基本公卫接口修改

Showing 1 changed file with 227 additions and 36 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java View file @ 947f00c
... ... @@ -78,13 +78,72 @@
78 78 if(list != null && list.size() > 0){
79 79 for(Patients patients : list){
80 80 try{
  81 + //居住地址
  82 + String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService);
  83 + String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService);
  84 + String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService);
  85 + String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService);
  86 + String jQquan = jzSheng+jzShi+jzXian+jzXiang;
  87 +
  88 + //户籍地址
  89 + String hjSheng = CommonsHelper.getName1(patients.getProvinceId(), basicConfigService);
  90 + String hjShi = CommonsHelper.getName1(patients.getCityId(), basicConfigService);
  91 + String hjXian = CommonsHelper.getName1(patients.getAreaId(), basicConfigService);
  92 + String hjXiang = CommonsHelper.getName1(patients.getStreetId(), basicConfigService);
  93 + String hQuan = hjSheng+hjShi+hjXian+hjXiang;
  94 +
81 95 AntExChuQuery antExChuQuery = new AntExChuQuery();
82 96 antExChuQuery.setParentId(patients.getId());
83 97 List<AntExChuModel> aList = antExService.queryAntExChu(antExChuQuery);
84 98 Map<String,String> map = new HashMap<String,String>();
85 99 if(aList != null && aList.size() > 0){
  100 + if(aList.get(0).getAbortionZR() != null){
  101 + map.put("SPONTANEOUSABORTIONCOUNT",aList.get(0).getAbortionZR().toString());
  102 + }
  103 + if(aList.get(0).getAbortionRG() != null){
  104 + map.put("ARTIFICIALABORTIONCOUNT",aList.get(0).getAbortionRG().toString());
  105 + }
  106 + if(aList.get(0).getPregnancyTimes() != null){
  107 + map.put("GRAVIDITY",aList.get(0).getPregnancyTimes().toString());
  108 + }
  109 + if(aList.get(0).getProdTime() != null){
  110 + map.put("PARITY",aList.get(0).getProdTime().toString());
  111 + }
  112 + map.put("HEIGHT",aList.get(0).getHeight());
  113 + map.put("WEIGHT",aList.get(0).getWeight());
  114 + if(aList.get(0).getHeight() != null && aList.get(0).getWeight() != null){
  115 + Double wh = Double.parseDouble(aList.get(0).getHeight()) / 100;
  116 + Double shen = wh * wh;
  117 + Double bmi = Double.parseDouble(aList.get(0).getWeight()) / shen;
  118 + map.put("BMI",bmi.toString());
  119 + }
  120 + String ssy = "";
  121 + String szy = "";
  122 + Map<String, String> chBpMap = JsonUtil.getMap(aList.get(0).getBp());
  123 + if (MapUtils.isNotEmpty(chBpMap)) {
  124 + ssy = chBpMap.get("ssy");
  125 + szy = chBpMap.get("szy");
  126 + }
  127 + map.put("SBP",ssy);
  128 + map.put("DBP",szy);
  129 + map.put("REGISTERPASTHISTORY",aList.get(0).getPastHistory());
  130 + map.put("REGISTERFAMILYHISTORY",aList.get(0).getFamilyHistory());
  131 + map.put("GESTATIONSTATUS",aList.get(0).getCestationInfo());
  132 + }
86 133  
  134 +
  135 + if("农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){
  136 + map.put("HOUSEHOLDTYPECODE", "1");
  137 + }else if("非农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){
  138 + map.put("HOUSEHOLDTYPECODE", "2");
87 139 }
  140 + if("本地".equals(getBasicConfig(patients.getPliveTypeId()))){
  141 + map.put("RESIDENCETYPECODE","1");
  142 + }else if("外地".equals(getBasicConfig(patients.getPliveTypeId()))){
  143 + map.put("RESIDENCETYPECODE","2");
  144 + }
  145 + map.put("OCCUPATIONCODE",patients.getPprofessionTypeId());
  146 + map.put("MENSESPERIOD",patients.getMensStartDay());
88 147 map.put("MATERNALINFOID",patients.getId());
89 148 map.put("NAME",patients.getUsername());
90 149 if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){
... ... @@ -99,10 +158,8 @@
99 158 map.put("HUSBANDAGE",DateUtil.getAge(patients.getHusbandBirth()).toString());
100 159 }
101 160 map.put("HUSBANDUNIT",patients.getHworkUnit());
102   - map.put("ADDRESS",null);
103   - map.put("HOUSEHOLDADDRESS", CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
104   - patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(),
105   - basicConfigService));
  161 + map.put("ADDRESS",jQquan);
  162 + map.put("HOUSEHOLDADDRESS",hQuan);
106 163 map.put("HUSBANDTELNO",patients.getHusbandPhone());
107 164 map.put("MENSESLASTDATE",DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
108 165 map.put("EXPECTEDCHILDBIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
109 166  
110 167  
111 168  
... ... @@ -137,19 +194,86 @@
137 194 * @return
138 195 */
139 196 public List<Map<String,String>> getChuZhen(String startDate,String endDate){
  197 + List<AntExChuModel> list = null;
140 198 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
141   - AntExChuQuery antExChuQuery = new AntExChuQuery();
142   - antExChuQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
143   - antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
144   - List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
  199 + AntExChuQuery antExChuQuery1 = new AntExChuQuery();
  200 + antExChuQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  201 + antExChuQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  202 + 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);
  208 + }
145 209 if(list != null && list.size() > 0){
146 210 for(AntExChuModel antExChuModel : list){
147 211 try{
148 212 Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId());
  213 +
  214 + //居住地址
  215 + String jzSheng = CommonsHelper.getName1(patients.getProvinceRegisterId(), basicConfigService);
  216 + String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService);
  217 + String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService);
  218 + String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService);
  219 + String jQquan = jzSheng+jzShi+jzXian+jzXiang;
  220 +
  221 + //户籍地址
  222 + String hjSheng = CommonsHelper.getName1(patients.getProvinceId(), basicConfigService);
  223 + String hjShi = CommonsHelper.getName1(patients.getCityId(), basicConfigService);
  224 + String hjXian = CommonsHelper.getName1(patients.getAreaId(), basicConfigService);
  225 + String hjXiang = CommonsHelper.getName1(patients.getStreetId(), basicConfigService);
  226 + String hQuan = hjSheng+hjShi+hjXian+hjXiang;
  227 +
149 228 String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), antExChuModel.getCheckTime());
150 229 int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周")));
151 230 int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天")));
152 231 Map<String,String> map = new HashMap<String,String>();
  232 + //增加孕产登记
  233 + if("农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){
  234 + map.put("HOUSEHOLDTYPECODE", "1");
  235 + }else if("非农业户口".equals(getBasicConfig(patients.getPcensusTypeId()))){
  236 + map.put("HOUSEHOLDTYPECODE", "2");
  237 + }
  238 + if("本地".equals(getBasicConfig(patients.getPliveTypeId()))){
  239 + map.put("RESIDENCETYPECODE","1");
  240 + }else if("外地".equals(getBasicConfig(patients.getPliveTypeId()))){
  241 + map.put("RESIDENCETYPECODE","2");
  242 + }
  243 + map.put("OCCUPATIONCODE",patients.getPprofessionTypeId());
  244 + map.put("MENSESPERIOD",patients.getMensStartDay());
  245 + map.put("MATERNALINFOID",patients.getId());
  246 + map.put("NAME",patients.getUsername());
  247 + if("70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())){
  248 + map.put("IDCARD",patients.getCardNo());
  249 + }
  250 + map.put("TELNO",patients.getPhone());
  251 + map.put("BIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getBirth()));
  252 + map.put("AGE",DateUtil.getAge(patients.getBirth()).toString());
  253 + map.put("UNIT",patients.getPworkUnit());
  254 + map.put("HUSBANDNAME",patients.getHusbandName());
  255 + if(patients.getHusbandBirth() != null){
  256 + map.put("HUSBANDAGE",DateUtil.getAge(patients.getHusbandBirth()).toString());
  257 + }
  258 + map.put("HUSBANDUNIT",patients.getHworkUnit());
  259 + map.put("ADDRESS",jQquan);
  260 + map.put("HOUSEHOLDADDRESS",hQuan);
  261 + map.put("HUSBANDTELNO",patients.getHusbandPhone());
  262 + map.put("MENSESLASTDATE",DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
  263 + map.put("EXPECTEDCHILDBIRTHDAY",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
  264 + String hospital = "";
  265 + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) {
  266 + Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId()));
  267 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  268 + hospital = organization.getName();
  269 + }
  270 + }
  271 + map.put("ORGNAME",hospital);
  272 + map.put("ORGCODE",patients.getHospitalId());
  273 + map.put("BUILDINGMANUALDATE",DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
  274 + map.put("NATIONALITYVALUE",getBasicConfig(patients.getPnationId()));
  275 + map.put("BUILDWEEKS", ResolveUtils.getPregnancyWeek(patients, patients.getBookbuildingDate()));
  276 +
153 277 map.put("MATERNALFIRSTFOLLOWUPID",antExChuModel.getId());
154 278 map.put("MATERNALINFOID",patients.getId());
155 279 map.put("NAME",patients.getUsername());
156 280  
... ... @@ -319,14 +443,39 @@
319 443 }
320 444 map.put("WVDEXAM",ydfmw);
321 445 map.put("ORGCODE",patients.getHospitalId());
322   - String hospital = "";
  446 + /*String hospital = "";
323 447 if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) {
324 448 Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId()));
325 449 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
326 450 hospital = organization.getName();
327 451 }
328 452 }
329   - map.put("ORGNAME",hospital);
  453 + map.put("ORGNAME",hospital);*/
  454 +
  455 +
  456 + if(antExChuModel.getAbortionZR() != null){
  457 + map.put("SPONTANEOUSABORTIONCOUNT",antExChuModel.getAbortionZR().toString());
  458 + }
  459 + if(antExChuModel.getAbortionRG() != null){
  460 + map.put("ARTIFICIALABORTIONCOUNT",antExChuModel.getAbortionRG().toString());
  461 + }
  462 + if(antExChuModel.getPregnancyTimes() != null){
  463 + map.put("GRAVIDITY",antExChuModel.getPregnancyTimes().toString());
  464 + }
  465 + if(antExChuModel.getProdTime() != null){
  466 + map.put("PARITY",antExChuModel.getProdTime().toString());
  467 + }
  468 + map.put("HEIGHT",antExChuModel.getHeight());
  469 + map.put("WEIGHT",antExChuModel.getWeight());
  470 + if(antExChuModel.getHeight() != null && antExChuModel.getWeight() != null){
  471 + Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100;
  472 + Double shen = wh * wh;
  473 + Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen;
  474 + map.put("BMI",bmi.toString());
  475 + }
  476 + map.put("REGISTERPASTHISTORY",antExChuModel.getPastHistory());
  477 + map.put("REGISTERFAMILYHISTORY",antExChuModel.getFamilyHistory());
  478 + map.put("GESTATIONSTATUS",antExChuModel.getCestationInfo());
330 479 mList.add(map);
331 480 }catch (Exception e){
332 481 e.printStackTrace();
333 482  
... ... @@ -347,11 +496,18 @@
347 496 * @return
348 497 */
349 498 public List<Map<String,String>> getFuZhen(String startDate,String endDate){
  499 + List<AntenatalExaminationModel> list = null;
350 500 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
351   - AntExQuery antExQuery = new AntExQuery();
352   - antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
353   - antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
354   - List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  501 + AntExQuery antExQuery1 = new AntExQuery();
  502 + antExQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  503 + antExQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  504 + list = antExService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  505 + if(null == list || list.size() == 0){
  506 + AntExQuery antExQuery = new AntExQuery();
  507 + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  508 + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  509 + list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  510 + }
355 511 if(list != null && list.size() > 0){
356 512 for(AntenatalExaminationModel data : list){
357 513 try{
358 514  
... ... @@ -422,11 +578,18 @@
422 578 * @return
423 579 */
424 580 public List<Map<String,String>> getFm(String startDate,String endDate){
  581 + List<MaternalDeliverModel> list = null;
425 582 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
426   - MatDeliverQuery deliverQuery = new MatDeliverQuery();
427   - deliverQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
428   - deliverQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
429   - List<MaternalDeliverModel> list = matDeliverService.query(deliverQuery);
  583 + MatDeliverQuery deliverQuery1 = new MatDeliverQuery();
  584 + deliverQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  585 + deliverQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  586 + list = matDeliverService.query(deliverQuery1);
  587 + if(null == list || list.size() == 0){
  588 + MatDeliverQuery deliverQuery = new MatDeliverQuery();
  589 + deliverQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  590 + deliverQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  591 + list = matDeliverService.query(deliverQuery);
  592 + }
430 593 if(list != null && list.size() > 0){
431 594 for(MaternalDeliverModel data : list) {
432 595 Patients patients = patientsService.findOnePatientById(data.getParentId());
433 596  
... ... @@ -689,12 +852,19 @@
689 852 * @return
690 853 */
691 854 public List<Map<String,String>> getXse(String startDate,String endDate){
  855 + List<BabyModel> models = null;
692 856 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
693   - BabyModelQuery babyQuery = new BabyModelQuery();
694   - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
695   - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
696   - babyQuery.setYn(YnEnums.YES.getId());
697   - List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  857 + BabyModelQuery babyQuery1 = new BabyModelQuery();
  858 + babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  859 + babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  860 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery1);
  861 + if(null == models || models.size() == 0){
  862 + BabyModelQuery babyQuery = new BabyModelQuery();
  863 + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  864 + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  865 + babyQuery.setYn(YnEnums.YES.getId());
  866 + models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  867 + }
698 868 if(models != null && models.size() > 0){
699 869 for(BabyModel babyModel : models){
700 870 try{
701 871  
... ... @@ -759,11 +929,18 @@
759 929 * @return
760 930 */
761 931 public List<Map<String,String>> getChfs(String startDate,String endDate){
  932 + List<MatdeliverFollowModel> list = null;
762 933 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
763   - MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery();
764   - deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate));
765   - deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate));
766   - List<MatdeliverFollowModel> list = matDeliverFollowService.query(deliverQuery);
  934 + MatDeliverFollowQuery deliverQuery1 = new MatDeliverFollowQuery();
  935 + deliverQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  936 + deliverQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  937 + list = matDeliverFollowService.query(deliverQuery1);
  938 + if(null == list || list.size() == 0){
  939 + MatDeliverFollowQuery deliverQuery = new MatDeliverFollowQuery();
  940 + deliverQuery.setUpdateDateStart(DateUtil.parseYMDHMS(startDate));
  941 + deliverQuery.setUpdateDateEnd(DateUtil.parseYMDHMS(endDate));
  942 + list = matDeliverFollowService.query(deliverQuery);
  943 + }
767 944 if(list != null && list.size() > 0){
768 945  
769 946 for(MatdeliverFollowModel data : list){
... ... @@ -773,7 +950,7 @@
773 950 MaternalDeliverModel md = matDeliverService.getOneMatDeliver(data.getDeliverId());
774 951 Patients patients = patientsService.findOnePatientById(md.getParentId());
775 952 map.put("POSTPARTUMFOLLOWUPID",data.getId());
776   - map.put("MATERNALINFOID",patients.getId());
  953 + map.put("MATERNALINFOID", patients.getId());
777 954 map.put("NAME",patients.getUsername());
778 955 if(data.getVisitDate() != null){
779 956 map.put("FOLLOWUPDATE",DateUtil.getyyyy_MM_dd(data.getVisitDate()));
780 957  
... ... @@ -887,11 +1064,18 @@
887 1064 * @return
888 1065 */
889 1066 public List<Map<String,String>> getCh42fs(String startDate,String endDate){
  1067 + List<PostReviewModel> list = null;
890 1068 List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
891   - PostReviewQuery mongoQuery = new PostReviewQuery();
892   - mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
893   - mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
894   - List<PostReviewModel> list = postReviewService.findWithList(mongoQuery);
  1069 + PostReviewQuery mongoQuery1 = new PostReviewQuery();
  1070 + mongoQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  1071 + mongoQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  1072 + list = postReviewService.findWithList(mongoQuery1);
  1073 + if(null == list || list.size() == 0){
  1074 + PostReviewQuery mongoQuery = new PostReviewQuery();
  1075 + mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  1076 + mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  1077 + list = postReviewService.findWithList(mongoQuery);
  1078 + }
895 1079 if(list != null && list.size() > 0){
896 1080 for(PostReviewModel data : list){
897 1081 try{
898 1082  
... ... @@ -1321,11 +1505,18 @@
1321 1505 * @return
1322 1506 */
1323 1507 public List<Map<String,String>> getEb(String startDate,String endDate){
  1508 + List<BabyCheckModel> list = null;
1324 1509 List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
1325   - BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
1326   - babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
1327   - babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
1328   - List<BabyCheckModel> list = babyCheckService.queryBabyCheckRecord(babyQuery);
  1510 + BabyCheckModelQuery babyQuery1 = new BabyCheckModelQuery();
  1511 + babyQuery1.setCreatedTimeStart(DateUtil.parseYMDHMS(startDate));
  1512 + babyQuery1.setCreatedTimeEnd(DateUtil.parseYMDHMS(endDate));
  1513 + list = babyCheckService.queryBabyCheckRecord(babyQuery1);
  1514 + if(null == list || list.size() == 0){
  1515 + BabyCheckModelQuery babyQuery = new BabyCheckModelQuery();
  1516 + babyQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate));
  1517 + babyQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate));
  1518 + list = babyCheckService.queryBabyCheckRecord(babyQuery);
  1519 + }
1329 1520 if(list != null && list.size() > 0){
1330 1521 for(BabyCheckModel babyCheckModel : list){
1331 1522 try{