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 09d80d9..e08cfd0 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 @@ -4314,202 +4314,200 @@ public class ViewFacade { List> deliverList = new ArrayList<>(); List list = patientsService.queryPatient1(patientsQuery, "created"); if (CollectionUtils.isNotEmpty(list)) { - Patients pat = list.get(0); + for (Patients pat : list) + { + Map patientMap = new HashMap<>(); - Map patientMap = new HashMap<>(); + patientMap.put("mid",pat.getId());// + patientMap.put("mbuilddate",DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间 - patientMap.put("mid",pat.getId());// - patientMap.put("mbuilddate",DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));// 建档时间 - - String buildHospital = ""; - if (StringUtils.isNotEmpty(pat.getHospitalId())) { - Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId())); - if (organization != null && organization.getYn() == YnEnums.YES.getId()) { - buildHospital = organization.getName(); + String buildHospital = ""; + if (StringUtils.isNotEmpty(pat.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + buildHospital = organization.getName(); + } + } + patientMap.put("mbuildhospital",buildHospital);//建档单位 + + patientMap.put("mname",pat.getUsername());//母亲姓名 + patientMap.put("mcountry",getBasicConfig(pat.getPcountryId()));//母亲国籍 + patientMap.put("mnation",getBasicConfig(pat.getPnationId()));//母亲民族 + patientMap.put("mbirthday",DateUtil.getyyyy_MM_dd(pat.getBirth()));//母亲出生日期 + patientMap.put("mcardtype",getBasicConfig(pat.getPcerteTypeId()));//母亲证件类型 + patientMap.put("mcardnum", pat.getCardNo());//母亲证件号码 + patientMap.put("maddress",CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), + pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 + + + patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 + + patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍 + patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族 + String fage = ""; + if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) && + pat.getHcertificateNum().length() == 18 && + "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) { + String cardNo = pat.getHcertificateNum().substring(6, 14); + Date date = DateUtil.parseYYYYMMDD(cardNo); + Integer age = DateUtil.getAge(date); + fage = String.valueOf(age); } - } - patientMap.put("mbuildhospital",buildHospital);//建档单位 - - patientMap.put("mname",pat.getUsername());//母亲姓名 - patientMap.put("mcountry",getBasicConfig(pat.getPcountryId()));//母亲国籍 - patientMap.put("mnation",getBasicConfig(pat.getPnationId()));//母亲民族 - patientMap.put("mbirthday",DateUtil.getyyyy_MM_dd(pat.getBirth()));//母亲出生日期 - patientMap.put("mcardtype",getBasicConfig(pat.getPcerteTypeId()));//母亲证件类型 - patientMap.put("mcardnum", pat.getCardNo());//母亲证件号码 - patientMap.put("maddress",CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), - pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 - - - patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 - - patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍 - patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族 - String fage = ""; - if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) && - pat.getHcertificateNum().length() == 18 && - "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(pat.getHcertificateTypeId())) { - String cardNo = pat.getHcertificateNum().substring(6, 14); - Date date = DateUtil.parseYYYYMMDD(cardNo); - Integer age = DateUtil.getAge(date); - fage = String.valueOf(age); - } - patientMap.put("fbirthday",fage);//父亲出生日期 - patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 + patientMap.put("fbirthday",fage);//父亲出生日期 + patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 - patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码 - patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(), - pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(), - basicConfigService));//父亲户籍地址 + patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码 + patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(), + pat.getHareaRegisterId(), pat.getHstreetRegisterId(), pat.getHaddressRegister(), + basicConfigService));//父亲户籍地址 - Organization organization = null; - String fmHospital = ""; - if (StringUtils.isNotEmpty(pat.getFmHospital())) { - if (com.lyms.platform.common.utils.StringUtils.isNum(pat.getFmHospital())) { - organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital())); - if (organization != null && organization.getYn() == YnEnums.YES.getId()) { - fmHospital = organization.getName(); + Organization organization = null; + String fmHospital = ""; + if (StringUtils.isNotEmpty(pat.getFmHospital())) { + if (com.lyms.platform.common.utils.StringUtils.isNum(pat.getFmHospital())) { + organization = organizationService.getOrganization(Integer.parseInt(pat.getFmHospital())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + fmHospital = organization.getName(); + } + } else { + fmHospital = pat.getFmHospital(); } - } else { - fmHospital = pat.getFmHospital(); + } + patientMap.put("hospital",fmHospital);//接生单位 - } - patientMap.put("hospital",fmHospital);//接生单位 - - - MatDeliverQuery deliverQuery = new MatDeliverQuery(); - deliverQuery.setYn(YnEnums.YES.getId()); - deliverQuery.setParentId(pat.getId()); - List datas = matDeliverService.query(deliverQuery); - if (CollectionUtils.isNotEmpty(datas)) { - String deliverDoctor = ""; - if (StringUtils.isNotEmpty(datas.get(0).getDeliverDoctor())) { - if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getDeliverDoctor())) { - Users users = usersService.getUsers(Integer.parseInt(datas.get(0).getDeliverDoctor())); - if (users != null && users.getYn() == YnEnums.YES.getId()) { - deliverDoctor = users.getName(); + MatDeliverQuery deliverQuery = new MatDeliverQuery(); + deliverQuery.setYn(YnEnums.YES.getId()); + deliverQuery.setParentId(pat.getId()); + List datas = matDeliverService.query(deliverQuery); + if (CollectionUtils.isNotEmpty(datas)) { + String deliverDoctor = ""; + if (StringUtils.isNotEmpty(datas.get(0).getDeliverDoctor())) { + if (com.lyms.platform.common.utils.StringUtils.isNum(datas.get(0).getDeliverDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(datas.get(0).getDeliverDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + deliverDoctor = users.getName(); + } + } else { + deliverDoctor = datas.get(0).getDeliverDoctor(); } - } else { - deliverDoctor = datas.get(0).getDeliverDoctor(); } - } - patientMap.put("doctor",deliverDoctor);//接生人 - MaternalDeliverModel data = datas.get(0); + patientMap.put("doctor",deliverDoctor);//接生人 + MaternalDeliverModel data = datas.get(0); - String place = ""; //1 "住院" : "其他 - if (data.getFmType() != null && "1".equals(data.getFmType())) - { - if (fmHospital.contains("妇幼")) + String place = ""; //1 "住院" : "其他 + if (data.getFmType() != null && "1".equals(data.getFmType())) { - place = "妇幼保健医院"; + if (fmHospital.contains("妇幼")) + { + place = "妇幼保健医院"; + } + else + { + place = fmHospital; + } } else { - place = fmHospital; + place = "其他"; } - } - else - { - place = "其他"; - } - patientMap.put("place",place);//出生地点分类 + patientMap.put("place",place);//出生地点分类 + List babyList = new ArrayList(); - List babyList = new ArrayList(); + SimpleDateFormat hh = new SimpleDateFormat("HH"); + SimpleDateFormat mm = new SimpleDateFormat("mm"); - SimpleDateFormat hh = new SimpleDateFormat("HH"); - SimpleDateFormat mm = new SimpleDateFormat("mm"); + List babies = data.getBaby(); + if (CollectionUtils.isNotEmpty(babies)) { + for (MaternalDeliverModel.Baby baby : babies) { + Map map = new HashMap<>(); - 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()))); - //新生儿性别 - map.put("babyid", baby.getId()); - //新生儿主键 - map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( - Integer.parseInt(baby.getBabyGender()))); + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); + Integer week = betweenDay / 7; + Integer day = betweenDay % 7; - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); - Integer week = betweenDay / 7; - Integer 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(pat.getFmHospital())); + } - if (StringUtils.isNotEmpty(data.getFmHospital()) && com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { - organization = organizationService.getOrganization(Integer.parseInt(pat.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("weight", StringUtils.isNotEmpty(baby.getBabyWeight()) ? baby.getBabyWeight() : ""); - //新生儿身长（厘米） - map.put("height", 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); } - - patientMap.put("newborninfo", babyList); + patientMap.put("address", CommonsHelper.getResidence(pat.getProvincePostRestId(), pat.getCityPostRestId(), + pat.getAreaPostRestId(), pat.getStreetPostRestId(), pat.getAddressPostRest(), basicConfigService));//母亲产后休养地 + deliverList.add(patientMap); } - patientMap.put("address", CommonsHelper.getResidence(pat.getProvincePostRestId(), pat.getCityPostRestId(), - pat.getAreaPostRestId(), pat.getStreetPostRestId(), pat.getAddressPostRest(), basicConfigService));//母亲产后休养地 - deliverList.add(patientMap); } deliverMap.put("motherinfo",deliverList); }