diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index b0ad329..b358085 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -67,18 +67,12 @@ public class AntExChuModel extends BaseModel { private Integer stillbirth; //死产 private Integer stillChan ; - //妊娠月份 - private Integer gestaMonth; - //妊娠时间 - private String gestaDate; - //分娩方式 - private Integer fmType; - //分娩方式备注 - private String fmTypeRemark; - //健康状况 - private Integer fitness; - //健康状况备注 - private String fitnessRemark; + + //初诊其他信息 + private List antExcAddOthers; + //存活胎儿数 + private Integer survFetus; + // 身高 private String height; //体重 @@ -208,53 +202,20 @@ public class AntExChuModel extends BaseModel { return yljzxs; } - public Integer getGestaMonth() { - return gestaMonth; - } - - public void setGestaMonth(Integer gestaMonth) { - this.gestaMonth = gestaMonth; - } - - public Integer getFmType() { - return fmType; - } - - public void setFmType(Integer fmType) { - this.fmType = fmType; - } - - public String getFmTypeRemark() { - return fmTypeRemark; + public List getAntExcAddOthers() { + return antExcAddOthers; } - public void setFmTypeRemark(String fmTypeRemark) { - this.fmTypeRemark = fmTypeRemark; + public void setAntExcAddOthers(List antExcAddOthers) { + this.antExcAddOthers = antExcAddOthers; } - public Integer getFitness() { - return fitness; - } - - public void setFitness(Integer fitness) { - this.fitness = fitness; - } - - public String getGestaDate() { - return gestaDate; - } - - public void setGestaDate(String gestaDate) { - this.gestaDate = gestaDate; - } - - - public String getFitnessRemark() { - return fitnessRemark; + public Integer getSurvFetus() { + return survFetus; } - public void setFitnessRemark(String fitnessRemark) { - this.fitnessRemark = fitnessRemark; + public void setSurvFetus(Integer survFetus) { + this.survFetus = survFetus; } public void setYljzxs(String yljzxs) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 5e985f3..e2c2282 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -560,8 +560,6 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("您已经做过初诊"); } } - - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } 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 0570c6a..bca996d 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 @@ -8,6 +8,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.result.BabyCheckPageResult; import com.lyms.platform.operate.web.result.BabyPageResult; @@ -321,10 +322,10 @@ public class ViewFacade { if (tire != null) { String heartRate = tire.get("heartRate"); String fetalPosition = tire.get("fetalPosition"); - if(StringUtils.isNotEmpty(heartRate)){ + if (StringUtils.isNotEmpty(heartRate)) { hrateSb.append(UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN) + "/"); } - if(StringUtils.isNotEmpty(fetalPosition)&&!"null".equals(fetalPosition)){ + if (StringUtils.isNotEmpty(fetalPosition) && !"null".equals(fetalPosition)) { fposiSb.append(FetalPositionEnums.getTitle(fetalPosition) + "/"); } } @@ -368,7 +369,7 @@ public class ViewFacade { String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckDate()); String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); - if (raom.getCreated().before(data.getCheckDate())||checkTime.equals(Created)) { + if (raom.getCreated().before(data.getCheckDate()) || checkTime.equals(Created)) { isZhuan = true; continue; } @@ -383,7 +384,7 @@ public class ViewFacade { } catch (Exception e) { } - }else{ + } else { map.put(numStr + "isZhuan", "1"); } } else { @@ -562,12 +563,10 @@ public class ViewFacade { {//7糖尿病 jws.add("7"); } - if (pastHistory.contains("其他[")) - {//8其他 + if (pastHistory.contains("其他[")) {//8其他 map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他") + 2, pastHistory.length())); } - if (CollectionUtils.isEmpty(jws)) - { + if (CollectionUtils.isEmpty(jws)) { jws.add("1");//无 } map.put("pastHistory", jws); @@ -1009,8 +1008,7 @@ public class ViewFacade { map.put("ydqjd", "4"); } } - if (StringUtils.isNotEmpty(data.getbChao())) - { + if (StringUtils.isNotEmpty(data.getbChao())) { map.put("bChao", data.getbChao()); } @@ -1025,7 +1023,7 @@ public class ViewFacade { for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckTime()); String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); - if (raom.getCreated().before(data.getCheckTime())||checkTime.equals(Created)) { + if (raom.getCreated().before(data.getCheckTime()) || checkTime.equals(Created)) { isZhuan = true; continue; } @@ -1037,20 +1035,20 @@ public class ViewFacade { if (null != zhuanc1) { map.put("zhuancl", zhuanc1.getName()); map.put("isZhuan", "2"); - }else{ + } else { map.put("isZhuan", "1"); } } catch (Exception e) { e.printStackTrace(); } - }else{ + } else { // map.put("zhuancl", hospital); map.put("isZhuan", 1); } } else { map.put("isZhuan", "1"); } - }else{ + } else { map.put("isZhuan", "1"); } @@ -1132,26 +1130,6 @@ public class ViewFacade { map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark", patients.getMremark()); - //妊娠月份 - if(data.getGestaMonth()!=null){ - map.put("gestaMonth", GestaMonthEnums.getTitle(data.getGestaMonth())); - } - - - //妊娠时间 - map.put("gestaDate", data.getGestaDate()); - //分娩方式 - if(data.getFmType()!=null){ - map.put("fmType", CZFmTypeEnums.getTitle(data.getFmType())); - } - //分娩方式备注 - map.put("fmTypeRemark", data.getFmTypeRemark()); - //健康状况 - if(data.getFitness()!=null){ - map.put("fitness", FitnessEnums.getTitle(data.getFitness())); - } - //健康状况备注 - map.put("fitnessRemark", data.getFitnessRemark()); //处理高危因素 getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); @@ -1195,8 +1173,8 @@ public class ViewFacade { //实验结果选择 //hiv 抗体 // private String hivktSelect; - map.put("syjgSelect", StringUtils.isNotEmpty(data.getSyjgSelect())?SYJGEums.getTitle(data.getSyjgSelect()):""); - map.put("hivktSelect", StringUtils.isNotEmpty(data.getHivktSelect())?SYJGEums.getTitle(data.getHivktSelect()):""); + map.put("syjgSelect", StringUtils.isNotEmpty(data.getSyjgSelect()) ? SYJGEums.getTitle(data.getSyjgSelect()) : ""); + map.put("hivktSelect", StringUtils.isNotEmpty(data.getHivktSelect()) ? SYJGEums.getTitle(data.getHivktSelect()) : ""); // {\"yesOrNo\":\"yes\",\"yg\":true,\"bg\":true,\"azb\":true,\"md\":true,\"qt\":true,\"qtText\":\"bdfgsf\"} map.put("infectDiseases", ""); @@ -1335,49 +1313,49 @@ public class ViewFacade { map.put("lungs", data.getLungs()); - if(StringUtils.isNotEmpty(data.getVulvaSele())){ - if("2".equals(data.getVulvaSele())){ + if (StringUtils.isNotEmpty(data.getVulvaSele())) { + if ("2".equals(data.getVulvaSele())) { map.put("vulvaSele", "未见异常"); - }else if("1".equals(data.getVulvaSele())){ + } else if ("1".equals(data.getVulvaSele())) { map.put("vulva", data.getVulva()); } - }else{//空 + } else {//空 map.put("vulva", data.getVulva()); } - if(StringUtils.isNotEmpty(data.getVaginaSele())){ - if("2".equals(data.getVaginaSele())){ + if (StringUtils.isNotEmpty(data.getVaginaSele())) { + if ("2".equals(data.getVaginaSele())) { map.put("vaginaSele", "未见异常"); - }else if("1".equals(data.getVaginaSele())){ + } else if ("1".equals(data.getVaginaSele())) { map.put("vagina", data.getVagina()); } - }else{//空 + } else {//空 map.put("vagina", data.getVagina()); } - if(StringUtils.isNotEmpty(data.getCervicalSele())){ - if("2".equals(data.getCervicalSele())){ + if (StringUtils.isNotEmpty(data.getCervicalSele())) { + if ("2".equals(data.getCervicalSele())) { map.put("cervicalSele", "未见异常"); - }else if("1".equals(data.getCervicalSele())){ + } else if ("1".equals(data.getCervicalSele())) { map.put("cervical", data.getCervical()); } - }else{//空 + } else {//空 map.put("cervical", data.getCervical()); } - if(StringUtils.isNotEmpty(data.getUterusSele())){ - if("2".equals(data.getUterusSele())){ + if (StringUtils.isNotEmpty(data.getUterusSele())) { + if ("2".equals(data.getUterusSele())) { map.put("uterusSele", "未见异常"); - }else if("1".equals(data.getUterusSele())){ + } else if ("1".equals(data.getUterusSele())) { map.put("uterus", data.getUterus()); } - }else{//空 + } else {//空 map.put("uterus", data.getUterus()); } - if(StringUtils.isNotEmpty(data.getFujianSele())){ - if("1".equals(data.getFujianSele())){ + if (StringUtils.isNotEmpty(data.getFujianSele())) { + if ("1".equals(data.getFujianSele())) { map.put("fujian", data.getFujian()); - }else if("2".equals(data.getFujianSele())){ + } else if ("2".equals(data.getFujianSele())) { map.put("fujianSele", "未见异常"); } - }else{//空 + } else {//空 map.put("fujian", data.getFujian()); } @@ -1392,6 +1370,29 @@ public class ViewFacade { } map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM)); map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber())); + + + //妊娠信息 + List antExcAddOthersList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(data.getAntExcAddOthers())) { + List antExcAddOthers = data.getAntExcAddOthers(); + if (CollectionUtils.isNotEmpty(antExcAddOthers)) { + for (AntExcAddOther obj : antExcAddOthers) { + Map otherMap = new HashMap<>(); + otherMap.put("gestaMonth", obj.getGestaMonth()); + otherMap.put("gestaDate", obj.getGestaDate()); + otherMap.put("fmType", obj.getFmType()); + otherMap.put("fmTypeRemark", obj.getFmTypeRemark()); + otherMap.put("fitness", obj.getFitness()); + otherMap.put("fitnessRemark", obj.getFitnessRemark()); + otherMap.put("newborWeight", obj.getNewborWeight()); + antExcAddOthersList.add(otherMap); + } + } + } + map.put("antExcAddOthers", antExcAddOthersList); + + //胎儿情况 List placetaList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(data.getPlacentas())) { @@ -1639,6 +1640,7 @@ public class ViewFacade { * @param id * @return */ + public BaseObjectResponse findAntenatalExamination(String id) { BaseObjectResponse br = new BaseObjectResponse(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddOther.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddOther.java new file mode 100644 index 0000000..8a2289f --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddOther.java @@ -0,0 +1,81 @@ +package com.lyms.platform.operate.web.request; + +import java.io.Serializable; + +/** + * @auther yangfei + * @createTime 2017年07月22日 09时59分 + * @discription 初诊其他信息 + */ +public class AntExcAddOther implements Serializable { + //妊娠月份 + private Integer gestaMonth; + //妊娠时间 + private String gestaDate; + //分娩方式 + private Integer fmType; + //分娩方式备注 + private String fmTypeRemark; + //健康状况 + private Integer fitness; + //健康状况备注 + private String fitnessRemark; + //新生儿体重 + private String newborWeight; + + public Integer getGestaMonth() { + return gestaMonth; + } + + public void setGestaMonth(Integer gestaMonth) { + this.gestaMonth = gestaMonth; + } + + public String getGestaDate() { + return gestaDate; + } + + public void setGestaDate(String gestaDate) { + this.gestaDate = gestaDate; + } + + public Integer getFmType() { + return fmType; + } + + public void setFmType(Integer fmType) { + this.fmType = fmType; + } + + public String getFmTypeRemark() { + return fmTypeRemark; + } + + public void setFmTypeRemark(String fmTypeRemark) { + this.fmTypeRemark = fmTypeRemark; + } + + public Integer getFitness() { + return fitness; + } + + public void setFitness(Integer fitness) { + this.fitness = fitness; + } + + public String getFitnessRemark() { + return fitnessRemark; + } + + public void setFitnessRemark(String fitnessRemark) { + this.fitnessRemark = fitnessRemark; + } + + public String getNewborWeight() { + return newborWeight; + } + + public void setNewborWeight(String newborWeight) { + this.newborWeight = newborWeight; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index e84d99c..327edaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -142,19 +142,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String nextCheckTime; //前端计算出来的孕周 private String cDueWeek; - //妊娠月份 - private Integer gestaMonth; - //妊娠时间 - private String gestaDate; - //分娩方式 - private Integer fmType; - //分娩方式备注 - private String fmTypeRemark; - //健康状况 - private Integer fitness; - //健康状况备注 - private String fitnessRemark; + //初诊其他信息 + private List antExcAddOthers; + //存活胎儿数 + private Integer survFetus; /** * 辅助检查结果录入 @@ -1032,52 +1024,20 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.highriskSocre = highriskSocre; } - public Integer getGestaMonth() { - return gestaMonth; + public List getAntExcAddOthers() { + return antExcAddOthers; } - public void setGestaMonth(Integer gestaMonth) { - this.gestaMonth = gestaMonth; + public void setAntExcAddOthers(List antExcAddOthers) { + this.antExcAddOthers = antExcAddOthers; } - public Integer getFmType() { - return fmType; + public Integer getSurvFetus() { + return survFetus; } - public void setFmType(Integer fmType) { - this.fmType = fmType; - } - - public Integer getFitness() { - return fitness; - } - - public void setFitness(Integer fitness) { - this.fitness = fitness; - } - - public String getGestaDate() { - return gestaDate; - } - - public void setGestaDate(String gestaDate) { - this.gestaDate = gestaDate; - } - - public String getFmTypeRemark() { - return fmTypeRemark; - } - - public void setFmTypeRemark(String fmTypeRemark) { - this.fmTypeRemark = fmTypeRemark; - } - - public String getFitnessRemark() { - return fitnessRemark; - } - - public void setFitnessRemark(String fitnessRemark) { - this.fitnessRemark = fitnessRemark; + public void setSurvFetus(Integer survFetus) { + this.survFetus = survFetus; } public String getNextCheckTime() { @@ -1214,12 +1174,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); - antExChuModel.setGestaMonth(gestaMonth); - antExChuModel.setGestaDate(gestaDate); - antExChuModel.setFmType(fmType); - antExChuModel.setFmTypeRemark(fmTypeRemark); - antExChuModel.setFitness(fitness); - antExChuModel.setFitnessRemark(fitnessRemark); + antExChuModel.setAntExcAddOthers(antExcAddOthers); + antExChuModel.setSurvFetus(survFetus); antExChuModel.setVulvaSele(vulvaSele); antExChuModel.setVaginaSele(vaginaSele); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index a3be1fa..b6d9836 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.operate.web.request.AntExcAddOther; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.pojo.AntExChuModel; @@ -163,6 +164,11 @@ public class AntexChuResult { private Map bp; private List placentas; + //存活胎儿数 + private Integer survFetus; + + //初诊其他信息 + private List antExcAddOthers; /* //心率 private double heartRate; //胎方位 @@ -1212,15 +1218,27 @@ public class AntexChuResult { this.birthDefectTodo = birthDefectTodo; } + public Integer getSurvFetus() { + return survFetus; + } + + public void setSurvFetus(Integer survFetus) { + this.survFetus = survFetus; + } + + public List getAntExcAddOthers() { + return antExcAddOthers; + } + + public void setAntExcAddOthers(List antExcAddOthers) { + this.antExcAddOthers = antExcAddOthers; + } + public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { - setGestaMonth(antExChuModel.getGestaMonth()); - setGestaDate(antExChuModel.getGestaDate()); - setFmType(antExChuModel.getFmType()); - setFmTypeRemark(antExChuModel.getFmTypeRemark()); - setFitness(antExChuModel.getFitness()); - setFitnessRemark(antExChuModel.getFitnessRemark()); + setSurvFetus(antExChuModel.getSurvFetus()); + setAntExcAddOthers(antExChuModel.getAntExcAddOthers()); setDiagnosisOther(antExChuModel.getDiagnosisOther()); setBarCode(antExChuModel.getBarCode()); setId(antExChuModel.getId());