diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 94b8e09..4ec9f26 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -6235,7 +6235,7 @@ public class BasicConfigServiceTest { //saveCdgwOrg("F:\\承德工位\\qhdorg.xls"); //babyReport("G:\\儿童膳食报告.xls"); // saveQhdbabyDiaginose("F:\\承德工位\\秦皇岛儿童诊断 - 副本.xls"); - //saveQhdWeight("F:\\秦皇岛标准报告(1).xls"); + saveQhdWeight("F:\\秦皇岛标准报告(1).xls"); //dietaryIntake("F:\\膳食摄入量推荐.xls"); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml index b10bb34..943b88e 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml @@ -75,9 +75,11 @@ yn and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo} - + + and f.isconceive=#{isconceive} + AND = date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]> @@ -93,6 +95,7 @@ yn GROUP BY p.folvite_id + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 8704828..9777da3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -172,6 +172,7 @@ public class ViewFacade { /** * 查看信息 + * * @param destModel * @return */ @@ -206,7 +207,6 @@ public class ViewFacade { } - public AmnioResultResult getAmnioResultView(AmniocentesisResultModel destModel) { AmnioResultResult data = new AmnioResultResult(); data.convertToResult(destModel); @@ -5481,9 +5481,7 @@ public class ViewFacade { List organizations = organizationService.queryOrganization(query); if (CollectionUtils.isNotEmpty(organizations)) { patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); - } - else - { + } else { deliverMap.put("motherinfo", new ArrayList<>()); return deliverMap; } @@ -5547,7 +5545,6 @@ public class ViewFacade { patientMap.put("hospital", fmHospital);//接生单位 - patientMap.put("mphone", pat.getPhone()); patientMap.put("mname", pat.getUsername());//母亲姓名 @@ -5625,82 +5622,84 @@ public class ViewFacade { List babies = data.getBaby(); if (CollectionUtils.isNotEmpty(babies)) { for (MaternalDeliverModel.Baby baby : babies) { - Map map = new HashMap<>(); - - //新生儿性别 - map.put("babyid", baby.getId()); - //新生儿主键 - map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( - Integer.parseInt(baby.getBabyGender()))); - - Integer week = 0; - Integer day = 0; - Map dueMap = data.getHandDueWeek(); - if (dueMap != null && dueMap.size() > 0 && dueMap.get("week") != null && !"".equals(dueMap.get("week"))) { - week = (dueMap.get("week") == null || "".equals(dueMap.get("week"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); - day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); - } else { - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); - week = betweenDay / 7; - day = betweenDay % 7; - } + //子查询活产的 儿童信息 + if ("0".equals(baby.getPregnancyOut())) { + Map map = new HashMap<>(); + //新生儿性别 + map.put("babyid", baby.getId()); + //新生儿主键 + map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( + Integer.parseInt(baby.getBabyGender()))); + + Integer week = 0; + Integer day = 0; + Map dueMap = data.getHandDueWeek(); + if (dueMap != null && dueMap.size() > 0 && dueMap.get("week") != null && !"".equals(dueMap.get("week"))) { + week = (dueMap.get("week") == null || "".equals(dueMap.get("week"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); + day = (dueMap.get("day") == null || "".equals(dueMap.get("day"))) ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); + } else { + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); + week = betweenDay / 7; + day = betweenDay % 7; + } - Date fmDate = DateUtil.parseYMDHM(baby.getDueTime()); + Date fmDate = DateUtil.parseYMDHM(baby.getDueTime()); - //出生孕周(周) - map.put("babyweek", String.valueOf(week)); + //出生孕周(周) + map.put("babyweek", String.valueOf(week)); - map.put("babyday", String.valueOf(day)); - //新生儿出生日期 - map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate)); + map.put("babyday", String.valueOf(day)); + //新生儿出生日期 + map.put("babybirthday", DateUtil.getyyyy_MM_dd(fmDate)); - //新生儿出生日期 小时 - map.put("babybirthdayhour", hh.format(fmDate)); + //新生儿出生日期 小时 + map.put("babybirthdayhour", hh.format(fmDate)); - //新生儿出生日期 分 - map.put("babybirthdayminute", mm.format(fmDate)); + //新生儿出生日期 分 + map.put("babybirthdayminute", mm.format(fmDate)); - if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { - organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); - } + if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { + organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); + } - String babyprovince = ""; - String babycity = ""; - String babydistrict = ""; - if (organization != null) { - babyprovince = getBasicConfig(organization.getProvinceId()); - babycity = getBasicConfig(organization.getCityId()); - babydistrict = getBasicConfig(organization.getAreaId()); - } + String babyprovince = ""; + String babycity = ""; + String babydistrict = ""; + if (organization != null) { + babyprovince = getBasicConfig(organization.getProvinceId()); + babycity = getBasicConfig(organization.getCityId()); + babydistrict = getBasicConfig(organization.getAreaId()); + } - //新生儿出生地(省) - map.put("babyprovince", babyprovince); + //新生儿出生地(省) + map.put("babyprovince", babyprovince); - //新生儿出生地(市) - map.put("babycity", babycity); + //新生儿出生地(市) + map.put("babycity", babycity); - //新生儿出生地(区县) - map.put("babydistrict", babydistrict); + //新生儿出生地(区县) + map.put("babydistrict", babydistrict); - String babyState = ""; - if (baby.getDeformity() != null && baby.getDeformity() == 1) { - babyState = "差"; - } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { - babyState = "一般"; - } else { - babyState = "良好"; - } + String babyState = ""; + if (baby.getDeformity() != null && baby.getDeformity() == 1) { + babyState = "差"; + } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { + babyState = "一般"; + } else { + babyState = "良好"; + } - //新生儿健康状态 - map.put("babystate", babyState); + //新生儿健康状态 + map.put("babystate", babyState); - //新生儿体重(克) - map.put("babyweight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : ""); - //新生儿身长(厘米) - map.put("babylength", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : ""); + //新生儿体重(克) + map.put("babyweight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : ""); + //新生儿身长(厘米) + map.put("babylength", StringUtils.isNotEmpty(baby.getBabyHeight()) ? baby.getBabyHeight() : ""); - babyList.add(map); + babyList.add(map); + } } } patientMap.put("newborninfo", babyList);