diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index 67dfc0a..6946287 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -44,8 +44,6 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private String certificateTypeId; //就诊卡号 private String vcCardNo; - //婚检医生 - private String hunJianDoctor; //医学意见 private Integer yiXueYiJian; //性别类型 @@ -96,9 +94,6 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (StringUtils.isNotBlank(vcCardNo)) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if (StringUtils.isNotBlank(hunJianDoctor)) { - condition = condition.and("hunJianDoctor", hunJianDoctor, MongoOper.IS); - } if (yiXueYiJian!=null) { condition = condition.and("yiXueYiJian", yiXueYiJian, MongoOper.IS); } @@ -215,14 +210,6 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ this.vcCardNo = vcCardNo; } - public String getHunJianDoctor() { - return hunJianDoctor; - } - - public void setHunJianDoctor(String hunJianDoctor) { - this.hunJianDoctor = hunJianDoctor; - } - public Integer getYiXueYiJian() { return yiXueYiJian; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 25b2eb0..a897be7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -23,6 +23,7 @@ import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.DoctorModel; import com.lyms.platform.pojo.PremaritalCheckup; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.PremaritalCheckupQuery; @@ -427,7 +428,13 @@ public class PremaritalCheckupFacade { map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); - map.put("hunJianDoctor", checkup.getHunJianDoctor()); + String hunJianDoctor = ""; + if (checkup.getHunJianDoctor()!=null){ + DoctorModel doctorModel = checkup.getHunJianDoctor(); + hunJianDoctor = doctorModel.getName(); + } + + map.put("hunJianDoctor", hunJianDoctor); map.put("id", checkup.getId()); list.add(map); } @@ -855,16 +862,28 @@ public class PremaritalCheckupFacade { map.put("certificateNum", DefenceUtils.getId(certificateNum)); map.put("vcCardNo", vcCardNo); map.put("sexType", "女"); + + String spouseName = ""; + String spouseCertificateTypeId = ""; + String spouseCertificateNum = ""; + String isBloodshed = ""; + String bloodshed = ""; if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { map.put("deliverStatus", "提供"); + spouseName = checkup.getSpouseName(); + spouseCertificateTypeId = getBaseicConfigByid(checkup.getSpouseCertificateTypeId()); + spouseCertificateNum = checkup.getSpouseCertificateNum(); + isBloodshed = FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one); + bloodshed = checkup.getBloodshed(); } else { map.put("deliverStatus", "未提供"); } - map.put("spouseName", checkup.getSpouseName()); - map.put("spouseCertificateTypeId", getBaseicConfigByid(checkup.getSpouseCertificateTypeId())); - map.put("spouseCertificateNum", checkup.getSpouseCertificateNum()); - map.put("isBloodshed", FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one)); - map.put("bloodshed", checkup.getBloodshed()); + map.put("spouseName", spouseName); + map.put("spouseCertificateTypeId", spouseCertificateTypeId); + map.put("spouseCertificateNum",spouseCertificateNum); + map.put("isBloodshed",isBloodshed ); + map.put("bloodshed", bloodshed); + map.put("menarcheAge", checkup.getMenarcheAge()); map.put("menstrualCycle", checkup.getMenstrualCycle()); map.put("menstrualAmount", checkup.getMenstrualAmount()); @@ -912,8 +931,12 @@ public class PremaritalCheckupFacade { map.put("jiZhu", FunvCommonUtil.havaOrNOInteger(checkup.getJiZhu(), two)); map.put("jiZhuDetails", checkup.getJiZhuDetails()); map.put("qianBiaoLinBaJie", checkup.getQianBiaoLinBaJie()); - map.put("shiLi", checkup.getShiLiZuo() + "/" + checkup.getShiLiYou()); - map.put("tingLi", checkup.getTingLiZuo() + "/" + checkup.getTingLiYou()); + + String shiLi = (checkup.getShiLiZuo() == null? "" : checkup.getShiLiZuo()) + "/" + (checkup.getShiLiYou() == null ? "": checkup.getShiLiYou()); + String tingLi = (checkup.getTingLiZuo() == null? "" : checkup.getTingLiZuo()) + "/" + (checkup.getTingLiYou() == null ? "": checkup.getTingLiYou()); + + map.put("shiLi", shiLi); + map.put("tingLi", tingLi); map.put("bianSe", FunvCommonUtil.havaOrNOInteger(checkup.getBianSe(), two)); map.put("bianSeDetails", checkup.getBianSeDetails()); @@ -979,8 +1002,8 @@ public class PremaritalCheckupFacade { map.put("niaoQianXue", checkup.getNiaoQianXue()); map.put("niaoChangGuiQiTa", checkup.getNiaoChangGuiQiTa()); - map.put("xueXing", checkup.getXueXing()); - map.put("rhxueXing", checkup.getRhxueXing()); + map.put("xueXing", getBaseicConfigByid(checkup.getXueXing())); + map.put("rhxueXing", FunvCommonUtil.checkYiGan(checkup.getRhxueXing())); map.put("xueTang", checkup.getXueTang()); map.put("xueQingGuBing", checkup.getXueQingGuBing()); @@ -988,18 +1011,18 @@ public class PremaritalCheckupFacade { map.put("xueDanBai", checkup.getXueDanBai()); map.put("zongDanHongSu", checkup.getZongDanHongSu()); map.put("jieHeDanHongSu", checkup.getJieHeDanHongSu()); - map.put("bingGan", checkup.getBingGan()); + map.put("bingGan", FunvCommonUtil.checkYiGan(checkup.getBingGan())); - map.put("yiGanKangYuan", checkup.getYiGanKangYuan()); - map.put("yiGanKangTi", checkup.getYiGanKangTi()); - map.put("yiGanEKangYuan", checkup.getYiGanEKangYuan()); - map.put("yiGanEKangTi", checkup.getYiGanEKangTi()); - map.put("yiGanHeXinKangTi", checkup.getYiGanHeXinKangTi()); + map.put("yiGanKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanKangYuan())); + map.put("yiGanKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanKangTi())); + map.put("yiGanEKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangYuan())); + map.put("yiGanEKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangTi())); + map.put("yiGanHeXinKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanHeXinKangTi())); map.put("xueQingJiGan", checkup.getXueQingJiGan()); map.put("xueNiaoSuDan", checkup.getXueNiaoSuDan()); - map.put("shiYanJieGuo", checkup.getShiYanJieGuo()); - map.put("hiv", checkup.getHiv()); + map.put("shiYanJieGuo", FunvCommonUtil.checkYiGan(checkup.getShiYanJieGuo())); + map.put("hiv", FunvCommonUtil.checkYiGan(checkup.getHiv())); map.put("linBing", checkup.getLinBing()); map.put("xiongTou", checkup.getXiongTou()); @@ -1012,14 +1035,20 @@ public class PremaritalCheckupFacade { } map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails()); map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); - map.put("hunJianDoctor", checkup.getHunJianDoctor()); + String hunJianDoctor = ""; + if (checkup.getHunJianDoctor()!=null){ + DoctorModel doctorModel = checkup.getHunJianDoctor(); + hunJianDoctor = doctorModel.getName(); + } + + map.put("hunJianDoctor", hunJianDoctor); list.add(map); } } out = response.getOutputStream(); Map cnames = new LinkedHashMap<>(); cnames.put("username", "姓名"); - cnames.put("phone", "类型方式"); + cnames.put("phone", "联系方式"); cnames.put("age", "年龄"); cnames.put("hospital", "婚检机构"); cnames.put("premaritalUpTime", "婚检时间"); @@ -1221,19 +1250,30 @@ public class PremaritalCheckupFacade { } map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); - map.put("certificateNum", DefenceUtils.getId(certificateNum)); + map.put("certificateNum", FunvCommonUtil.getId(certificateNum)); map.put("vcCardNo", vcCardNo); map.put("sexType", "男"); + + String spouseName = ""; + String spouseCertificateTypeId = ""; + String spouseCertificateNum = ""; + String isBloodshed = ""; + String bloodshed = ""; if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { map.put("deliverStatus", "提供"); + spouseName = checkup.getSpouseName(); + spouseCertificateTypeId = getBaseicConfigByid(checkup.getSpouseCertificateTypeId()); + spouseCertificateNum = checkup.getSpouseCertificateNum(); + isBloodshed = FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one); + bloodshed = checkup.getBloodshed(); } else { map.put("deliverStatus", "未提供"); } - map.put("spouseName", checkup.getSpouseName()); - map.put("spouseCertificateTypeId", getBaseicConfigByid(checkup.getSpouseCertificateTypeId())); - map.put("spouseCertificateNum", checkup.getSpouseCertificateNum()); - map.put("isBloodshed", FunvCommonUtil.havaOrNOInteger(checkup.getIsBloodshed(), one)); - map.put("bloodshed", checkup.getBloodshed()); + map.put("spouseName", spouseName); + map.put("spouseCertificateTypeId", spouseCertificateTypeId); + map.put("spouseCertificateNum",spouseCertificateNum); + map.put("isBloodshed",isBloodshed ); + map.put("bloodshed", bloodshed); map.put("maritalHistory", FunvCommonUtil.havaOrNOInteger(checkup.getMaritalHistory(), one)); map.put("sangOu", FunvCommonUtil.havaOrNOInteger(checkup.getSangOu(), three)); @@ -1277,8 +1317,11 @@ public class PremaritalCheckupFacade { map.put("jiZhu", FunvCommonUtil.havaOrNOInteger(checkup.getJiZhu(), two)); map.put("jiZhuDetails", checkup.getJiZhuDetails()); map.put("qianBiaoLinBaJie", checkup.getQianBiaoLinBaJie()); - map.put("shiLi", checkup.getShiLiZuo() + "/" + checkup.getShiLiYou()); - map.put("tingLi", checkup.getTingLiZuo() + "/" + checkup.getTingLiYou()); + + String shiLi = (checkup.getShiLiZuo() == null? "" : checkup.getShiLiZuo()) + "/" + (checkup.getShiLiYou() == null ? "": checkup.getShiLiYou()); + String tingLi = (checkup.getTingLiZuo() == null? "" : checkup.getTingLiZuo()) + "/" + (checkup.getTingLiYou() == null ? "": checkup.getTingLiYou()); + map.put("shiLi", shiLi); + map.put("tingLi", tingLi); map.put("bianSe", FunvCommonUtil.havaOrNOInteger(checkup.getBianSe(), two)); map.put("bianSeDetails", checkup.getBianSeDetails()); @@ -1369,8 +1412,8 @@ public class PremaritalCheckupFacade { map.put("niaoQianXue", checkup.getNiaoQianXue()); map.put("niaoChangGuiQiTa", checkup.getNiaoChangGuiQiTa()); - map.put("xueXing", checkup.getXueXing()); - map.put("rhxueXing", checkup.getRhxueXing()); + map.put("xueXing", getBaseicConfigByid(checkup.getXueXing())); + map.put("rhxueXing", FunvCommonUtil.checkYiGan(checkup.getRhxueXing())); map.put("xueTang", checkup.getXueTang()); map.put("xueQingGuBing", checkup.getXueQingGuBing()); @@ -1378,18 +1421,18 @@ public class PremaritalCheckupFacade { map.put("xueDanBai", checkup.getXueDanBai()); map.put("zongDanHongSu", checkup.getZongDanHongSu()); map.put("jieHeDanHongSu", checkup.getJieHeDanHongSu()); - map.put("bingGan", checkup.getBingGan()); + map.put("bingGan", FunvCommonUtil.checkYiGan(checkup.getBingGan())); - map.put("yiGanKangYuan", checkup.getYiGanKangYuan()); - map.put("yiGanKangTi", checkup.getYiGanKangTi()); - map.put("yiGanEKangYuan", checkup.getYiGanEKangYuan()); - map.put("yiGanEKangTi", checkup.getYiGanEKangTi()); - map.put("yiGanHeXinKangTi", checkup.getYiGanHeXinKangTi()); + map.put("yiGanKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanKangYuan())); + map.put("yiGanKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanKangTi())); + map.put("yiGanEKangYuan", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangYuan())); + map.put("yiGanEKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanEKangTi())); + map.put("yiGanHeXinKangTi", FunvCommonUtil.checkYiGan(checkup.getYiGanHeXinKangTi())); map.put("xueQingJiGan", checkup.getXueQingJiGan()); map.put("xueNiaoSuDan", checkup.getXueNiaoSuDan()); - map.put("shiYanJieGuo", checkup.getShiYanJieGuo()); - map.put("hiv", checkup.getHiv()); + map.put("shiYanJieGuo", FunvCommonUtil.checkYiGan(checkup.getShiYanJieGuo())); + map.put("hiv", FunvCommonUtil.checkYiGan(checkup.getHiv())); map.put("linBing", checkup.getLinBing()); map.put("xiongTou", checkup.getXiongTou()); @@ -1403,14 +1446,20 @@ public class PremaritalCheckupFacade { map.put("yiJianQiTaDetails", checkup.getYiJianQiTaDetails()); map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); - map.put("hunJianDoctor", checkup.getHunJianDoctor()); + String hunJianDoctor = ""; + if (checkup.getHunJianDoctor()!=null){ + DoctorModel doctorModel = checkup.getHunJianDoctor(); + hunJianDoctor = doctorModel.getName(); + } + + map.put("hunJianDoctor", hunJianDoctor); list.add(map); } } out = response.getOutputStream(); Map cnames = new LinkedHashMap<>(); cnames.put("username", "姓名"); - cnames.put("phone", "类型方式"); + cnames.put("phone", "联系方式"); cnames.put("age", "年龄"); cnames.put("hospital", "婚检机构"); cnames.put("premaritalUpTime", "婚检时间"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index 012a25d..d78ffd9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -266,8 +266,10 @@ public class FunvCommonUtil { public static final String YIN = "yin"; public static final String YANG = "yang"; + public static final String RUOYANG = "ruoyang"; public static final String JIA = "+"; public static final String JIAN = "-"; + public static final String JJ = "±"; /** * @@ -280,9 +282,13 @@ public class FunvCommonUtil { return JIAN; }else if (s.equals(YANG)){ return JIA; + }else if (s.equals(RUOYANG)){ + return JJ; + }else { + return ""; } } - return null; + return ""; }