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 23cc913..20f5730 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 @@ -6,6 +6,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; +import java.util.Map; /** * 产前检查初诊模型 @@ -21,6 +22,10 @@ public class AntExChuModel extends BaseModel { private String id; private String parentId; private String pid; + //实验结果选择 + private String syjgSelect; + //hiv 抗体 + private String hivktSelect; //新生儿死亡备注 private String neoDeathTodo; //出生缺陷儿备注 @@ -143,6 +148,32 @@ public class AntExChuModel extends BaseModel { //甲状腺过氧化物酶抗体 private String jzxgyhwmkt; + //传染病史 + private String infectDiseases; + + public String getInfectDiseases() { + return infectDiseases; + } + + public void setInfectDiseases(String infectDiseases) { + this.infectDiseases = infectDiseases; + } + + public String getSyjgSelect() { + return syjgSelect; + } + + public void setSyjgSelect(String syjgSelect) { + this.syjgSelect = syjgSelect; + } + + public String getHivktSelect() { + return hivktSelect; + } + + public void setHivktSelect(String hivktSelect) { + this.hivktSelect = hivktSelect; + } public String getCjzxs() { return cjzxs; 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 0de8437..ec44cb1 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.InitDataUtils; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; @@ -2252,26 +2253,27 @@ public class AntenatalExaminationFacade { public BaseResponse getEnums() { Map map = new HashMap<>(); - map.put("getFetPosition", getFetPosition()); - map.put("getFetal", getFetal()); - map.put("getJoin", getJoin()); - map.put("getTaiPan", getTaiPan()); - map.put("getTaiShu", getTaiShu()); - map.put("fuzhong", getFuZhong()); + map.put("getFetPosition", InitDataUtils.getFetPosition()); + map.put("getFetal",InitDataUtils. getFetal()); + map.put("getJoin", InitDataUtils.getJoin()); + map.put("getTaiPan",InitDataUtils. getTaiPan()); + map.put("getTaiShu",InitDataUtils. getTaiShu()); + map.put("fuzhong", InitDataUtils.getFuZhong()); //胎膜 - map.put("getTaiMo", getTm()); + map.put("getTaiMo",InitDataUtils. getTm()); //宫颈硬度 - map.put("getGjyd", getGJYD()); + map.put("getGjyd", InitDataUtils.getGJYD()); //宫颈位置 - map.put("getGjwz", getGJWZ()); + map.put("getGjwz",InitDataUtils. getGJWZ()); //先露位置 - map.put("getXlwz", getXLWZ()); + map.put("getXlwz",InitDataUtils. getXLWZ()); //阴道检测 - map.put("getYdjc", getYDJC()); + map.put("getYdjc", InitDataUtils.getYDJC()); //宫高 - map.put("getGongGao", getGongGao()); + map.put("getGongGao",InitDataUtils. getGongGao()); //横指 - map.put("getHengZhi", getHengZhi()); + map.put("getHengZhi",InitDataUtils. getHengZhi()); + map.put("getSyjg", InitDataUtils.getSyjg()); map.put("getHighRisk", basicConfigFacade.getHighRisk()); map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); map.put("xx", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING)); @@ -2283,18 +2285,6 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - //胎数 - public List getTaiShu() { - List list = new ArrayList<>(); - for (TaiShuEnums enums : TaiShuEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - public List convert() { List organization = organizationService.queryHospital(); List data = new ArrayList(); @@ -2308,148 +2298,4 @@ public class AntenatalExaminationFacade { } return data; } - - public List getFuZhong() { - List list = new ArrayList<>(); - for (FuZhongEnums enums : FuZhongEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //胎膜 - public List getTm() { - List list = new ArrayList<>(); - for (TaiShuEnums.TmEnums enums : TaiShuEnums.TmEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - //宫颈硬度 - public List getGJYD() { - List list = new ArrayList<>(); - for (GongJingEnums.YinDu enums : GongJingEnums.YinDu.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - //宫颈位置 - public List getGJWZ() { - List list = new ArrayList<>(); - for (GongJingEnums.WeiZhi enums : GongJingEnums.WeiZhi.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //先露位置 - public List getXLWZ() { - List list = new ArrayList<>(); - for (GongJingEnums.XLWeiZhi enums : GongJingEnums.XLWeiZhi.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //阴道检测 - public List getYDJC() { - List list = new ArrayList<>(); - for (GongJingEnums.YDJianCe enums : GongJingEnums.YDJianCe.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //宫高 - public List getGongGao() { - List list = new ArrayList<>(); - for (GongJingEnums.GongGao enums : GongJingEnums.GongGao.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //横指 - public List getHengZhi() { - List list = new ArrayList<>(); - for (GongJingEnums.HengZhi enums : GongJingEnums.HengZhi.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getValue()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - - - //胎方位 - public List getFetPosition() { - List list = new ArrayList<>(); - for (FetalPositionEnums enums : FetalPositionEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //胎先露 - public List getFetal() { - List list = new ArrayList<>(); - for (FetalEnums enums : FetalEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //衔接 - public List getJoin() { - List list = new ArrayList<>(); - for (JoinEnums enums : JoinEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - - //胎盘 - public List getTaiPan() { - List list = new ArrayList<>(); - for (TaiShuEnums.TaiPanEnums enums : TaiShuEnums.TaiPanEnums.values()) { - Map resultMap = new HashMap<>(); - resultMap.put("id", enums.getId()); - resultMap.put("name", enums.getName()); - list.add(resultMap); - } - return list; - } - } \ No newline at end of file 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 73fcdb0..0725587 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 @@ -28,6 +28,10 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String id; private String pid; + //实验结果选择 + private String syjgSelect; + //hiv 抗体 + private String hivktSelect; //预产期 private String dueDate; //末次月经 @@ -313,6 +317,32 @@ public class AntExcAddRequest implements IBasicRequestConvert { //出生缺陷儿备注 private String birthDefectTodo; + //传染病史 + private Map infectDiseases; + + public String getSyjgSelect() { + return syjgSelect; + } + + public void setSyjgSelect(String syjgSelect) { + this.syjgSelect = syjgSelect; + } + + public String getHivktSelect() { + return hivktSelect; + } + + public void setHivktSelect(String hivktSelect) { + this.hivktSelect = hivktSelect; + } + + public Map getInfectDiseases() { + return infectDiseases; + } + + public void setInfectDiseases(Map infectDiseases) { + this.infectDiseases = infectDiseases; + } public String getNeoDeathTodo() { return neoDeathTodo; @@ -1079,7 +1109,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setBirthDefectTodo(birthDefectTodo); antExChuModel.setDiagnosisOther(diagnosisOther); antExChuModel.setBg(bg); - + antExChuModel.setHivktSelect(hivktSelect); + antExChuModel.setSyjgSelect(syjgSelect); + antExChuModel.setInfectDiseases(JsonUtil.obj2JsonString(infectDiseases)); // //早孕期病毒检测 // private String zyqbd; // //nt检查 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 085212c..cda9cf6 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 @@ -73,6 +73,12 @@ public class AntexChuResult { private Map ysfyHistory; private Map hHealthInfo; + //传染病史 + private Map infectDiseases; + //实验结果选择 + private String syjgSelect; + //hiv 抗体 + private String hivktSelect; //孕次 private Integer pregnancyTimes; // 产次 @@ -368,6 +374,30 @@ public class AntexChuResult { this.hasRefer = hasRefer; } + public Map getInfectDiseases() { + return infectDiseases; + } + + public void setInfectDiseases(Map infectDiseases) { + this.infectDiseases = infectDiseases; + } + + public String getSyjgSelect() { + return syjgSelect; + } + + public void setSyjgSelect(String syjgSelect) { + this.syjgSelect = syjgSelect; + } + + public String getHivktSelect() { + return hivktSelect; + } + + public void setHivktSelect(String hivktSelect) { + this.hivktSelect = hivktSelect; + } + public int getHasSieve() { return hasSieve; } @@ -1094,6 +1124,13 @@ public class AntexChuResult { // private String s75gdgtt; // //甲状腺功能 // private String jzxgn; + setHivktSelect(antExChuModel.getHivktSelect()); + setSyjgSelect(antExChuModel.getSyjgSelect()); + try { + setInfectDiseases(JsonUtil.jkstr2Obj(antExChuModel.getInfectDiseases(), Map.class)); + } catch (Exception e) { + } + setZyqbdjc(antExChuModel.getZyqbd()); setNtjc(antExChuModel.getNtjc()); setCjsc(antExChuModel.getCjsc());