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 7c81c40..ab736b6 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 @@ -311,6 +311,24 @@ public class ViewFacade { map.put("highRisk", list); } + private void getscreenResult(List screenResult, Map map) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + List> list = new ArrayList<>(); + for(String scr:screenResult){ + basicConfigQuery.setId(scr); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + for (BasicConfig basicConfig : basicConfigs) { + Map scrMap = new HashMap<>(); + scrMap.put("id", basicConfig.getId()); + scrMap.put("name", basicConfig.getName()); + list.add(scrMap); + } + } + } + map.put("screenResult", list); + } + /** * 导出复诊查询 * @@ -1237,6 +1255,8 @@ public class ViewFacade { //处理高危因素 getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); + //完善筛查结果 + getscreenResult(data.getScreenResult(), map); //产检基本信息 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckTime())); @@ -1937,8 +1957,12 @@ public class ViewFacade { map.put("barCode", data.getBarCode()); + //完善高危 getRisk(data.getRiskFactor(), data.getOtherRisk(), map); + //完善筛查结果 + getscreenResult(data.getScreenResult(), map); + //产检基本信息 map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckDate())); map.put("currentDueDate", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); @@ -2010,16 +2034,13 @@ public class ViewFacade { map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); String gongGao = ""; - if (StringUtils.isNotEmpty(data.getGongGaoSelect()) ) - { + if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { if (StringUtils.isNotEmpty(data.getGongGaoType())) { gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(data.getGongGaoType()); } else { gongGao = GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()); } - } - else if (StringUtils.isNotEmpty(data.getGongGao())) - { + } else if (StringUtils.isNotEmpty(data.getGongGao())) { gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM); } @@ -2794,7 +2815,7 @@ public class ViewFacade { } map.put("diagnosis", diagnosis); map.put("diagOther", data.getDiagOther()); - if(StringUtils.isEmpty(data.getDiagOther())){ + if (StringUtils.isEmpty(data.getDiagOther())) { map.put("diagOther", diagnosis); } @@ -4312,8 +4333,7 @@ public class ViewFacade { patientsQuery.setCardNo(idCard); patientsQuery.setType(3); - if (StringUtils.isNotEmpty(hospitalName)) - { + if (StringUtils.isNotEmpty(hospitalName)) { OrganizationQuery query = new OrganizationQuery(); query.setName(hospitalName.trim()); query.setYn(YnEnums.YES.getId()); @@ -4321,32 +4341,28 @@ public class ViewFacade { if (CollectionUtils.isNotEmpty(organizations)) { patientsQuery.setHospitalId(String.valueOf(organizations.get(0).getId())); } - } - else - { - deliverMap.put("motherinfo",new ArrayList<>()); + } else { + deliverMap.put("motherinfo", new ArrayList<>()); return deliverMap; } List> deliverList = new ArrayList<>(); List list = patientsService.queryPatient1(patientsQuery, "created"); if (CollectionUtils.isNotEmpty(list)) { - for (Patients pat : list) - { + for (Patients pat : list) { MatDeliverQuery deliverQuery = new MatDeliverQuery(); deliverQuery.setYn(YnEnums.YES.getId()); deliverQuery.setParentId(pat.getId()); List datas = matDeliverService.query(deliverQuery); - if (CollectionUtils.isEmpty(datas)) - { + if (CollectionUtils.isEmpty(datas)) { continue; } 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())) { @@ -4355,23 +4371,22 @@ public class ViewFacade { buildHospital = organization.getName(); } } - patientMap.put("mbuildhospital",buildHospital);//建档单位 + 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("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(), + patientMap.put("maddress", CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(), pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址 - if (StringUtils.isNotEmpty(pat.getHusbandName())) - { - patientMap.put("fname",StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 + if (StringUtils.isNotEmpty(pat.getHusbandName())) { + patientMap.put("fname", StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名 - patientMap.put("fcountry",getBasicConfig(pat.getHcountryId()));//父亲国籍 - patientMap.put("fnation",getBasicConfig(pat.getHnationId()));//父亲民族 + patientMap.put("fcountry", getBasicConfig(pat.getHcountryId()));//父亲国籍 + patientMap.put("fnation", getBasicConfig(pat.getHnationId()));//父亲民族 String fbirthday = ""; if (StringUtils.isNotEmpty(pat.getHcertificateTypeId()) && StringUtils.isNotEmpty(pat.getHcertificateNum()) && pat.getHcertificateNum().length() == 18 && @@ -4381,28 +4396,25 @@ public class ViewFacade { fbirthday = DateUtil.getyyyy_MM_dd(date); } - patientMap.put("fbirthday",fbirthday);//父亲出生日期 - patientMap.put("fcardtype",getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 + patientMap.put("fbirthday", fbirthday);//父亲出生日期 + patientMap.put("fcardtype", getBasicConfig(pat.getHcertificateTypeId()));//父亲证件类型 - patientMap.put("fcardnum",StringUtils.isNotEmpty(pat.getHcertificateNum()) ? pat.getHcertificateNum() : "");//父亲证件号码 - patientMap.put("faddress",CommonsHelper.getResidence(pat.getHprovinceRegisterId(), pat.getHcityRegisterId(), + 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));//父亲户籍地址 - } - else - { - patientMap.put("fname","");//父亲姓名 - patientMap.put("fcountry","");//父亲国籍 - patientMap.put("fnation","");//父亲民族 - patientMap.put("fbirthday","");//父亲出生日期 - patientMap.put("fcardtype","");//父亲证件类型 - patientMap.put("fcardnum","");//父亲证件号码 - patientMap.put("faddress","");//父亲户籍地址 + } else { + patientMap.put("fname", "");//父亲姓名 + patientMap.put("fcountry", "");//父亲国籍 + patientMap.put("fnation", "");//父亲民族 + patientMap.put("fbirthday", "");//父亲出生日期 + patientMap.put("fcardtype", "");//父亲证件类型 + patientMap.put("fcardnum", "");//父亲证件号码 + patientMap.put("faddress", "");//父亲户籍地址 } - Organization organization = null; String fmHospital = ""; if (StringUtils.isNotEmpty(datas.get(0).getFmHospital())) { @@ -4426,36 +4438,28 @@ public class ViewFacade { Users users = usersService.getUsers(Integer.parseInt(datas.get(0).getDeliverDoctor())); if (users != null && users.getYn() == YnEnums.YES.getId()) { deliverDoctor = users.getName(); - } - else - { + } else { deliverDoctor = datas.get(0).getDeliverDoctor(); } } else { deliverDoctor = datas.get(0).getDeliverDoctor(); } } - patientMap.put("doctor",deliverDoctor);//接生人 + patientMap.put("doctor", deliverDoctor);//接生人 MaternalDeliverModel data = datas.get(0); String place = ""; //1 "住院" : "其他 - if (data.getFmType() != null && "1".equals(data.getFmType())) - { - if (fmHospital.contains("妇幼")) - { + if (data.getFmType() != null && "1".equals(data.getFmType())) { + if (fmHospital.contains("妇幼")) { place = "妇幼保健院"; - } - else - { + } else { place = "医院"; } - } - else - { + } else { place = "其他"; } - patientMap.put("place",place);//出生地点分类 + patientMap.put("place", place);//出生地点分类 List babyList = new ArrayList(); @@ -4476,13 +4480,10 @@ public class ViewFacade { 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"))); + 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 - { + } else { Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); week = betweenDay / 7; day = betweenDay % 7; @@ -4498,7 +4499,7 @@ public class ViewFacade { 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)); @@ -4511,8 +4512,7 @@ public class ViewFacade { String babyprovince = ""; String babycity = ""; String babydistrict = ""; - if (organization != null) - { + if (organization != null) { babyprovince = getBasicConfig(organization.getProvinceId()); babycity = getBasicConfig(organization.getCityId()); babydistrict = getBasicConfig(organization.getAreaId()); @@ -4528,16 +4528,11 @@ public class ViewFacade { map.put("babydistrict", babydistrict); String babyState = ""; - if (baby.getDeformity() != null && baby.getDeformity() == 1) - { + if (baby.getDeformity() != null && baby.getDeformity() == 1) { babyState = "差"; - } - else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) - { + } else if (StringUtils.isNotEmpty(baby.getBabyHealthy()) && !"健康".equals(baby.getBabyHealthy())) { babyState = "一般"; - } - else - { + } else { babyState = "良好"; } @@ -4559,11 +4554,9 @@ public class ViewFacade { deliverList.add(patientMap); } } - deliverMap.put("motherinfo",deliverList); - } - catch (Exception e) - { - System.out.println(e.getMessage()+"出生医学接口异常"); + deliverMap.put("motherinfo", deliverList); + } catch (Exception e) { + System.out.println(e.getMessage() + "出生医学接口异常"); } return deliverMap; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 04891c1..41c0728 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -59,6 +59,26 @@ public class AntenatalExaminationResult implements IBasicResultConvert screenResult; + //结果补充 + private String resultSupple; + + public List getScreenResult() { + return screenResult; + } + + public void setScreenResult(List screenResult) { + this.screenResult = screenResult; + } + + public String getResultSupple() { + return resultSupple; + } + + public void setResultSupple(String resultSupple) { + this.resultSupple = resultSupple; + } public List getmHighRiskReason() { return mHighRiskReason; @@ -566,6 +586,8 @@ public class AntenatalExaminationResult implements IBasicResultConvert screenResult; + //结果补充 + private String resultSupple; + + public List getScreenResult() { + return screenResult; + } + + public void setScreenResult(List screenResult) { + this.screenResult = screenResult; + } + + public String getResultSupple() { + return resultSupple; + } + + public void setResultSupple(String resultSupple) { + this.resultSupple = resultSupple; + } + public String getQuicken() { return quicken; } @@ -1540,6 +1561,8 @@ public class AntexChuResult { public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { + setScreenResult(antExChuModel.getScreenResult()); + setResultSupple(antExChuModel.getResultSupple()); setTtita(antExChuModel.getTtita()); setTotalThy(antExChuModel.getTotalThy()); setFtita(antExChuModel.getFtita());