jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 086fd62d4aa7fa4b9c055111a521ca68f91077ad

Authored by litao@lymsh.com
1 parent 3f5aabff3a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

bug修复

Showing 1 changed file with 18 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 086fd62
... ... @@ -125,7 +125,7 @@
125 125 couponReportMap.put("2_12", "产检券(十二)券使用人次");
126 126 /** 儿童 */
127 127 couponReportMap.put("7_1", "儿童建档券使用人次");
128   - couponReportMap.put("8_1", "新生儿保健券使用人次");
  128 +// couponReportMap.put("8_1", "新生儿保健券使用人次");
129 129 couponReportMap.put("8_2", "<div class='ag-double-line'>儿童保健券(一)<div>使用人次</div></div>");
130 130 couponReportMap.put("8_3", "<div class='ag-double-line'>儿童保健券(二)<div>使用人次</div></div>");
131 131 couponReportMap.put("8_4", "<div class='ag-double-line'>儿童保健券(三)<div><div>使用人次</div></div>");
... ... @@ -551,6 +551,12 @@
551 551 }
552 552  
553 553 private void setZeroDataByTemp(List<String> key, List<Map<String, Object>> couponReport) {
  554 + if(CollectionUtils.isNotEmpty(key)) {
  555 + key.remove("8_1");
  556 + }
  557 + if(CollectionUtils.isNotEmpty(couponReport)) {
  558 + couponReport.get(0).remove("8_1");
  559 + }
554 560 for (Map<String, Object> map : couponReport) {
555 561 for (String s : key) {
556 562 if(map.get(s) == null) {
557 563  
... ... @@ -966,10 +972,20 @@
966 972 week = DateUtil.getMonthDesc(babyModel.getBirth(), useDate);
967 973 doctorName = "产科病房"; /** 写死 */
968 974 }
969   - } else if(type == 8) {
  975 + } else if(type == 8 || type == 10) {
970 976 BabyCheckModel babyCheckModel = mongoTemplate.findById(usedId, BabyCheckModel.class);
971 977 if(babyCheckModel != null) {
972 978 BabyModel babyModel = mongoTemplate.findById(babyCheckModel.getBuildId(), BabyModel.class);
  979 + if(babyModel != null) {
  980 + week = DateUtil.getMonthDesc(babyModel.getBirth(), useDate);
  981 + username = findUserNameByPid(babyModel.getPid());
  982 + phone = findPhoneByPid(babyModel.getPid());
  983 + }
  984 + }
  985 + } else if(type == 9) {
  986 + NewbornVisit newbornVisit = mongoTemplate.findById(usedId, NewbornVisit.class);
  987 + if(newbornVisit != null) {
  988 + BabyModel babyModel = mongoTemplate.findById(newbornVisit.getBabyId(), BabyModel.class);
973 989 if(babyModel != null) {
974 990 week = DateUtil.getMonthDesc(babyModel.getBirth(), useDate);
975 991 username = findUserNameByPid(babyModel.getPid());