From c4601c077415724d95d1aa2ea85959c6e66f86c6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 14 Mar 2017 10:16:54 +0800 Subject: [PATCH] update code --- .../main/java/com/lyms/platform/pojo/Patients.java | 4 +- .../controller/PremaritalCheckupController.java | 20 +- .../web/facade/BabyStatisticsManagerFacade.java | 2 +- .../web/facade/PremaritalCheckupFacade.java | 634 ++++++++++- .../operate/web/result/BabyPageResult.java | 16 +- .../web/result/PremaritalCheckupPageResult.java | 1131 ++++++++++++++++++++ 6 files changed, 1797 insertions(+), 10 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index eb3df80..057e6fa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -91,7 +91,7 @@ public class Patients extends BaseModel { private String hstreetRegisterId; /******add by lqy end *********/ /** - * 地址 + *孕妇户籍地址 */ private String address; private String provinceId; @@ -128,7 +128,7 @@ public class Patients extends BaseModel { /** - * 户籍 + * 孕妇居住地 */ private String addressRegister; private String provinceRegisterId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java index ad5525c..33ff7cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java @@ -75,7 +75,7 @@ public class PremaritalCheckupController extends BaseController{ param.setVcCardNo(vcCardNo); param.setCardNo(certificateNum); } - return premaritalCheckupFacade.getPremaritalCheckup(param,loginState.getId()); + return premaritalCheckupFacade.getPremaritalCheckup(param, loginState.getId()); } /** @@ -90,7 +90,7 @@ public class PremaritalCheckupController extends BaseController{ public BaseListResponse queryPremaritalCheckup(@Valid PremaritalCheckupQueryRequest queryRequest, HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest,loginState.getId()); + return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest, loginState.getId()); } @RequestMapping(value = "/premaritalCheckupExport", method = RequestMethod.GET) @@ -119,4 +119,20 @@ public class PremaritalCheckupController extends BaseController{ return premaritalCheckupFacade.deletePremaritalCheckup(id,loginState.getId()); } + + /** + * + * @param id + * @param request + * @return + */ + @RequestMapping(value = "/queryPremaritalCheckupPage/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryPremaritalCheckup(@RequestParam("id") String id, + HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return premaritalCheckupFacade.queryPremaritalCheckupPage(id, loginState.getId()); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 2117323..eaa0b95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -830,7 +830,7 @@ public class BabyStatisticsManagerFacade { int tempCount = 0; for (int j = 0,len = list.size();j < len ;j++) { - if (list.get(j).get("EXAMINE_MONTH") != null && Integer.valueOf(list.get(j).get("EXAMINE_MONTH").toString()) == i) + if (list.get(j).get("EXAMINE_MONTH") != null && Integer.valueOf(list.get(j).get("EXAMINE_MONTH").toString()) == i) { tempCount+=Integer.valueOf(list.get(j).get("CNT").toString()); break; 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 24de6be..1b591ec 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 @@ -17,6 +17,7 @@ import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest; import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult; +import com.lyms.platform.operate.web.result.PremaritalCheckupPageResult; import com.lyms.platform.operate.web.result.PremaritalCheckupResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; @@ -34,6 +35,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import sun.applet.Main; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; @@ -1414,7 +1416,7 @@ public class PremaritalCheckupFacade { map.put("fuGaoZuo", checkup.getFuGaoZuo()); map.put("fuGaoYou", checkup.getFuGaoYou()); - map.put("jingMai", FunvCommonUtil.havaOrNOInteger(checkup.getJingMai(),one)); + map.put("jingMai", FunvCommonUtil.havaOrNOInteger(checkup.getJingMai(), one)); map.put("jingMaiZuo", checkup.getJingMaiZuo()); map.put("jingMaiYou", checkup.getJingMaiYou()); map.put("shengZhiQiTa", checkup.getShengZhiQiTa()); @@ -1646,4 +1648,634 @@ public class PremaritalCheckupFacade { return ""; } + public BaseObjectResponse queryPremaritalCheckupPage(String id, Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + PremaritalCheckup result = null; + ResidentsArchiveModel archiveModel = null; + Map archiveMap = null; + Map resultMap = new HashMap<>(); + List historyList = null; + + //婚检ID不为空 + if (StringUtils.isNotEmpty(id)) { + //婚检数据 + result = premaritalCheckupService.getPremaritalCheckup(id); + if (StringUtils.isNotEmpty(result.getParentId())) { + //居民数据 + archiveModel = residentsArchiveService.getResident(result.getParentId()); + } + } + if (archiveModel != null) { + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hospitalId); + query.setParentId(archiveModel.getId()); + List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(checkupList)) { + if (result == null) { + result = checkupList.get(0); + } + historyList = new ArrayList<>(); + //历史婚检记录 + for (PremaritalCheckup data : checkupList) { + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); + historyResult.setId(data.getId()); + historyResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(data.getPremaritalUpTime())); + Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); + if (org != null) { + historyResult.setPremaritalUpHospital(org.getName()); + historyResult.setHospitalId(data.getHospitalId()); + } + historyList.add(historyResult); + } + } + } + PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult(); + if (result != null) { + checkupResult = getPageResult(result, archiveModel); + } + + if (archiveModel != null) { + archiveMap = new HashMap<>(); + archiveMap.put("certificateNum", archiveModel.getCertificateNum()); + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); + archiveMap.put("username", archiveModel.getUsername()); + archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday())); + if (archiveModel.getSex() != null) { + if (archiveModel.getSex().equals(SystemConfig.WOMAN_ID)) { + archiveMap.put("sex", "女"); + } else if (archiveModel.getSex().equals(SystemConfig.MAN_ID)) { + archiveMap.put("sex", "男"); + } + } + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday() != null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null)); + archiveMap.put("phone", archiveModel.getPhone()); + archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), + archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService)); + archiveMap.put("workUnit", archiveModel.getWorkUnit()); + archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); + } + + resultMap.put("archiveResult", archiveMap); + resultMap.put("checkupResult", checkupResult); + resultMap.put("premaritalCheckupHistory", historyList); + + BaseObjectResponse response = new BaseObjectResponse(); + response.setData(resultMap); + response.setErrorcode(ErrorCodeConstants.SUCCESS); + response.setErrormsg("成功"); + return response; + } + + + //返回婚检信息 + public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result,ResidentsArchiveModel archiveModel){ + PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult(); + checkupResult.setUsername(archiveModel.getUsername()); + checkupResult.setSex(getBaseicConfigByid(archiveModel.getSex())); + checkupResult.setBirthday(DateUtil.getyyyy_MM_dd(archiveModel.getBirthday())); + checkupResult.setMonthAge(DateUtil.getAge(archiveModel.getBirthday(),new Date())+"岁"); + + //居住地 + String liveAddress = CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(), + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService); + checkupResult.setLiveAddress(liveAddress); + checkupResult.setPhone(archiveModel.getPhone()); + + checkupResult.setSpouseName(result.getSpouseName()); + checkupResult.setSpouseCertificateType(getBaseicConfigByid(result.getSpouseCertificateTypeId())); + checkupResult.setSpouseCertificateNum(result.getSpouseCertificateNum()); + String isBloodshed= ""; + if (result.getIsBloodshed() != null && 1 == result.getIsBloodshed()) + { + isBloodshed = "有"; + } + else if (result.getIsBloodshed() != null && 2 == result.getIsBloodshed()) + { + isBloodshed = "无"; + } + checkupResult.setIsBloodshed(isBloodshed); + + + + + checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime())); + String hunJianDoctor = ""; + if (result.getHunJianDoctor()!=null){ + Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } + } + checkupResult.setHunJianDoctor(hunJianDoctor); + + //查询的时候,返回医院的名称 + if (result.getHospitalId()!=null){ + Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId())); + if (organization!=null && organization.getYn()==YnEnums.YES.getId()){ + checkupResult.setHunJianHospital(organization.getName()); + } + } + + checkupResult.setMenarcheAge(result.getMenarcheAge()); + checkupResult.setMenstrualCycle(result.getMenstrualCycle()); + checkupResult.setMenstrualAmount(result.getMenstrualAmount()); + checkupResult.setLastMenses(result.getLastMenses()); + String menorrhalgia= ""; + if (result.getMenorrhalgia() != null && "1".equals(result.getMenorrhalgia())) + { + menorrhalgia = "有"; + } + else if (result.getMenorrhalgia() != null && "".equals(result.getMenorrhalgia())) + { + menorrhalgia = "无"; + } + checkupResult.setMenorrhalgia(menorrhalgia); + + if (result.getRenLiu() != null) + { + checkupResult.setRenLiu(result.getRenLiu()+"次"); + } + + String maritalHistory = null; + if (result.getMaritalHistory() != null && 1 == result.getMaritalHistory()) + { + maritalHistory+="有"; + String content = ""; + if (result.getLiYi() != null && 1 == result.getLiYi()) + { + content = strPj(content,"离异"); + } + + if (result.getSangOu() != null && 1 == result.getSangOu()) + { + content = strPj(content,"丧偶"); + } + if (StringUtils.isNotEmpty(content)) + { + maritalHistory+=content; + } + + } + else if (result.getMaritalHistory() != null && 2 == result.getMaritalHistory()) + { + maritalHistory = "无"; + } + + checkupResult.setMaritalHistory(maritalHistory); + + String nextOfKin = ""; + + if (result.getNextOfKin() != null && 1 == result.getNextOfKin()) + { + nextOfKin+="是"; + String content = ""; + if (result.getParents() != null && 1 == result.getParents()) + { + content = strPj(content,"父母"); + } + + if (result.getGrandparent() != null && 1 == result.getGrandparent()) + { + content = strPj(content,"祖父母"); + } + if (result.getMaternalGrandparents() != null && 1 == result.getMaternalGrandparents()) + { + content = strPj(content,"外祖父母"); + } + if (StringUtils.isNotEmpty(content)) + { + nextOfKin+=content; + } + + } + else if (result.getNextOfKin() != null && 2 == result.getNextOfKin()) + { + nextOfKin = "无"; + } + checkupResult.setNextOfKin(nextOfKin); + checkupResult.setChildrenNum(result.getChildrenNum() + "人"); + + + + String jingShenZhuangTai = ""; + if (result.getJingShenZhuangTai() != null && result.getJingShenZhuangTai() == 1) + { + jingShenZhuangTai+="异常" + strPj("",result.getJingShenZhuangTaiDetails()); + } + if (result.getJingShenZhuangTai() != null && result.getJingShenZhuangTai() == 2) + { + jingShenZhuangTai+="正常"; + } + checkupResult.setJingShenZhuangTai(jingShenZhuangTai); + + String yuYanNengLi = ""; + if (result.getYuYanNengLi() != null && result.getYuYanNengLi() == 1) + { + yuYanNengLi+="异常" + strPj("",result.getYuYanNengLiDetails()); + } + if (result.getYuYanNengLi() != null && result.getYuYanNengLi() == 2) + { + yuYanNengLi+="正常"; + } + checkupResult.setYuYanNengLi(yuYanNengLi); + + + + String teShuMianRong = ""; + if (result.getTeShuMianRong() != null && result.getTeShuMianRong() == 1) + { + teShuMianRong+="异常" + strPj("",result.getTeShuMianRongDetails()); + } + if (result.getTeShuMianRong() != null && result.getTeShuMianRong() == 2) + { + teShuMianRong+="正常"; + } + checkupResult.setTeShuMianRong(teShuMianRong); + + + String teShuTiTai = ""; + if (result.getTeShuTiTai() != null && result.getTeShuTiTai() == 1) + { + teShuTiTai+="异常" + strPj("",result.getTeShuTiTaiDetails()); + } + if (result.getTeShuTiTai() != null && result.getTeShuTiTai() == 2) + { + teShuTiTai+="正常"; + } + checkupResult.setTeShuTiTai(teShuTiTai); + + checkupResult.setHeight(result.getHeight()); + checkupResult.setWeight(result.getWeight()); + checkupResult.setBp(result.getBp()); + + String piFu = ""; + if (result.getPiFu() != null && result.getPiFu() == 1) + { + + piFu+="是"; + String content = ""; + if (result.getPiZheng() != null) + { + content = strPj(content,"皮疹:"+result.getPiZheng()); + } + + if (result.getBiHan() != null) + { + content = strPj(content,"闭汗:"+result.getBiHan()); + } + if (result.getGanJue() != null) + { + content = strPj(content,"感觉异常:"+result.getGanJue()); + } + if (StringUtils.isNotEmpty(content)) + { + piFu+=content; + } + + } + if (result.getPiFu() != null && result.getPiFu() == 2) + { + piFu+="无"; + } + checkupResult.setPiFu(piFu); + + + + //毛发(1: 异常 2: 正常) + + String maoFa = ""; + if (result.getMaoFa() != null && result.getMaoFa() == 1) + { + maoFa+="是"; + String content = ""; + if (result.getFenBu() != null) + { + content = strPj(content,"分布:"+result.getFenBu()); + } + + if (result.getYanSe() != null) + { + content = strPj(content,"颜色:"+result.getYanSe()); + } + if (result.getBuWei() != null) + { + content = strPj(content,"脱离部位:"+result.getBuWei()); + } + if (StringUtils.isNotEmpty(content)) + { + maoFa+=content; + } + + } + if (result.getMaoFa() != null && result.getMaoFa() == 2) + { + maoFa+="无"; + } + checkupResult.setMaoFa(maoFa); + + //四肢(1: 有 2: 无) + String siZhi = ""; + if (result.getSiZhi() != null && result.getSiZhi() == 1) + { + siZhi+="有"; + String content = ""; + if (result.getJiWeiSuo() != null && result.getJiWeiSuo() == 1) + { + content = strPj(content,"肌萎缩"); + } + + if (result.getMaBi() != null && result.getMaBi() == 1) + { + content = strPj(content,"麻痹"); + } + if (result.getJingLuan() != null && result.getJingLuan() == 1) + { + content = strPj(content,"痉挛"); + } + if (result.getZhengChan() != null && result.getZhengChan() == 1) + { + content = strPj(content,"震颤"); + } + if (result.getSiZhiQiTa() != null && result.getSiZhiQiTa() == 1) + { + content = strPj(content,result.getSiZhiQiTaDetails()); + } + if (StringUtils.isNotEmpty(content)) + { + siZhi+=content; + } + } + if (result.getSiZhi() != null && result.getSiZhi() == 2) + { + siZhi+="无"; + } + checkupResult.setSiZhi(siZhi); + + + //脊柱(1: 异常 2: 正常) + String jiZhu = ""; + if (result.getJiZhu() != null && result.getJiZhu() == 1) + { + jiZhu+="异常"; + String content = ""; + if (result.getJiZhuDetails() != null) + { + content = strPj(content,result.getJiZhuDetails()); + } + if (StringUtils.isNotEmpty(content)) + { + maoFa+=content; + } + } + if (result.getJiZhu() != null && result.getJiZhu() == 2) + { + jiZhu+="正常"; + } + checkupResult.setJiZhu(jiZhu); + checkupResult.setQianBiaoLinBaJie(result.getQianBiaoLinBaJie()); + + //视力 + checkupResult.setShiLi(result.getShiLiZuo() + "/" + result.getShiLiYou()); + checkupResult.setTingLi(result.getTingLiZuo() + "/" + result.getTingLiYou()); + + + //辨色能力(1: 异常 2: 正常) + String bianSe = ""; + if (result.getBianSe() != null && result.getJiZhu() == 1) + { + bianSe+="异常"; + String content = ""; + if (result.getBianSeDetails() != null) + { + content = strPj(content,result.getBianSeDetails()); + } + if (StringUtils.isNotEmpty(content)) + { + bianSe+=content; + } + } + if (result.getBianSe() != null && result.getBianSe() == 2) + { + bianSe+="正常"; + } + checkupResult.setBianSe(bianSe); + + //甲状腺(1: 异常 2: 正常) + String jiaZhuangXian = ""; + + checkupResult.setJiaZhuangXian(jiaZhuangXian); +// +// //胸廓(1: 异常 2: 正常) +// private String xiongKuo; +// +// //肺(1: 异常 2: 正常) +// private String fei; +// +// //心率 +// private String heartRate; +// +// //心律 +// private String heartRhythm; +// +// //杂音(1: 异常 2: 正常) +// private String zaYin; +// +// //肝 +// private String gan; +// //脾 +// private String pi; +// //体格检查其他 +// private String tiGeQiTa; + + +// checkupResult.setMaritalHistory(result.getMaritalHistory()); +// checkupResult.setSangOu(result.getSangOu()); +// checkupResult.setLiYi(result.getLiYi()); +// checkupResult.setChildrenNum(result.getChildrenNum()); +// checkupResult.setNextOfKin(result.getNextOfKin()); +// checkupResult.setParents(result.getParents()); +// checkupResult.setGrandparent(result.getGrandparent()); +// checkupResult.setMaternalGrandparents(result.getMaternalGrandparents()); +// +// checkupResult.setJingShenZhuangTai(result.getJingShenZhuangTai()); +// checkupResult.setJingShenZhuangTaiDetails(result.getJingShenZhuangTaiDetails()); +// checkupResult.setYuYanNengLi(result.getYuYanNengLi()); +// checkupResult.setYuYanNengLiDetails(result.getYuYanNengLiDetails()); +// +// checkupResult.setTeShuMianRong(result.getTeShuMianRong()); +// checkupResult.setTeShuMianRongDetails(result.getTeShuMianRongDetails()); +// checkupResult.setTeShuTiTai(result.getTeShuTiTai()); +// checkupResult.setTeShuTiTaiDetails(result.getTeShuTiTaiDetails()); +// +// checkupResult.setHeight(result.getHeight()); +// checkupResult.setWeight(result.getWeight()); +// checkupResult.setBp(result.getBp()); +// +// checkupResult.setPiFu(result.getPiFu()); +// checkupResult.setPiZheng(result.getPiZheng()); +// checkupResult.setBiHan(result.getBiHan()); +// checkupResult.setGanJue(result.getGanJue()); +// checkupResult.setMaoFa(result.getMaoFa()); +// +// checkupResult.setFenBu(result.getFenBu()); +// checkupResult.setYanSe(result.getYanSe()); +// checkupResult.setBuWei(result.getBuWei()); +// checkupResult.setSiZhi(result.getSiZhi()); +// checkupResult.setJiWeiSuo(result.getJiWeiSuo()); +// checkupResult.setMaBi(result.getMaBi()); +// checkupResult.setJingLuan(result.getJingLuan()); +// checkupResult.setZhengChan(result.getZhengChan()); +// checkupResult.setSiZhiQiTa(result.getSiZhiQiTa()); +// checkupResult.setSiZhiQiTaDetails(result.getSiZhiQiTaDetails()); +// checkupResult.setJiZhu(result.getJiZhu()); +// checkupResult.setJiZhuDetails(result.getJiZhuDetails()); +// checkupResult.setQianBiaoLinBaJie(result.getQianBiaoLinBaJie()); +// checkupResult.setShiLiZuo(result.getShiLiZuo()); +// checkupResult.setShiLiYou(result.getShiLiYou()); +// +// checkupResult.setTingLiZuo(result.getTingLiZuo()); +// checkupResult.setTingLiYou(result.getTingLiYou()); +// checkupResult.setBianSe(result.getBianSe()); +// checkupResult.setBianSeDetails(result.getBianSeDetails()); +// +// checkupResult.setJiaZhuangXian(result.getJiaZhuangXian()); +// checkupResult.setJiaZhuangXianDetails(result.getJiaZhuangXianDetails()); +// checkupResult.setXiongKuo(result.getXiongKuo()); +// checkupResult.setXiongKuoDetails(result.getXiongKuoDetails()); +// checkupResult.setFei(result.getFei()); +// checkupResult.setFeiDetails(result.getFeiDetails()); +// checkupResult.setHeartRate(result.getHeartRate()); +// checkupResult.setHeartRhythm(result.getHeartRhythm()); +// checkupResult.setZaYin(result.getZaYin()); +// checkupResult.setZaYinDetails(result.getZaYinDetails()); +// checkupResult.setGan(result.getGan()); +// checkupResult.setPi(result.getPi()); +// checkupResult.setTiGeQiTa(result.getTiGeQiTa()); + +// checkupResult.setTiTai(result.getTiTai()); +// checkupResult.setTiTaiDetails(result.getTiTaiDetails()); +// checkupResult.setRuFangFaYu(result.getRuFangFaYu()); +// checkupResult.setRuFangFaYuDetails(result.getRuFangFaYuDetails()); +// checkupResult.setYinMao(result.getYinMao()); +// checkupResult.setHouJie(result.getHouJie()); +// checkupResult.setHouJieDetails(result.getHouJieDetails()); +// checkupResult.setRuXianNvXingHua(result.getRuXianNvXingHua()); +// checkupResult.setRuXianNvXingHuaDetails(result.getRuXianNvXingHuaDetails()); + + checkupResult.setGcWaiYin(result.getGcWaiYin()); + checkupResult.setGcFenMiWu(result.getGcFenMiWu()); + checkupResult.setGcZiGong(result.getGcZiGong()); + checkupResult.setGcFuJian(result.getGcFuJian()); + + checkupResult.setWaiYin(result.getWaiYin()); + checkupResult.setYinDao(result.getYinDao()); + checkupResult.setGongJing(result.getGongJing()); + checkupResult.setZiGong(result.getZiGong()); + checkupResult.setFuJian(result.getFuJian()); + checkupResult.setYinDaoQiTa(result.getYinDaoQiTa()); + +// checkupResult.setjBa(result.getjBa()); +// checkupResult.setjBaDetails(result.getjBaDetails()); +// checkupResult.setBaoPi(result.getBaoPi()); +// checkupResult.setGaoWan(result.getGaoWan()); +// checkupResult.setGaoWanZuo(result.getGaoWanZuo()); +// checkupResult.setGaoWanYou(result.getGaoWanYou()); +// checkupResult.setFuGao(result.getFuGao()); +// checkupResult.setFuGaoZuo(result.getFuGaoZuo()); +// checkupResult.setFuGaoYou(result.getFuGaoYou()); +// checkupResult.setJingMai(result.getJingMai()); +// checkupResult.setJingMaiZuo(result.getJingMaiZuo()); +// checkupResult.setJingMaiYou(result.getJingMaiYou()); +// checkupResult.setShengZhiQiTa(result.getShengZhiQiTa()); + + checkupResult.setXueHongDanBai(result.getXueHongDanBai()); + checkupResult.setBaiXiBao(result.getBaiXiBao()); + checkupResult.setXueXiaoBan(result.getXueXiaoBan()); + checkupResult.setXueChangGuiQiTa(result.getXueChangGuiQiTa()); + checkupResult.setNiaoDanBai(result.getNiaoDanBai()); + checkupResult.setNiaoTang(result.getNiaoTang()); + checkupResult.setNiaoTongTi(result.getNiaoTongTi()); + checkupResult.setNiaoQianXue(result.getNiaoQianXue()); + checkupResult.setNiaoChangGuiQiTa(result.getNiaoChangGuiQiTa()); + checkupResult.setXueXing(result.getXueXing()); + checkupResult.setRhxueXing(result.getRhxueXing()); + checkupResult.setXueTang(result.getXueTang()); + checkupResult.setXueQingGuBing(result.getXueQingGuBing()); + checkupResult.setXueQingGuCao(result.getXueQingGuCao()); + checkupResult.setXueDanBai(result.getXueDanBai()); + checkupResult.setZongDanHongSu(result.getZongDanHongSu()); + checkupResult.setJieHeDanHongSu(result.getJieHeDanHongSu()); + checkupResult.setBingGan(result.getBingGan()); + checkupResult.setYiGanKangYuan(result.getYiGanKangYuan()); + checkupResult.setYiGanKangTi(result.getYiGanKangTi()); + checkupResult.setYiGanEKangYuan(result.getYiGanEKangYuan()); + checkupResult.setYiGanEKangTi(result.getYiGanEKangTi()); + checkupResult.setYiGanHeXinKangTi(result.getYiGanHeXinKangTi()); + checkupResult.setXueQingJiGan(result.getXueQingJiGan()); + checkupResult.setXueNiaoSuDan(result.getXueNiaoSuDan()); + checkupResult.setShiYanJieGuo(result.getShiYanJieGuo()); + checkupResult.setHiv(result.getHiv()); + checkupResult.setLinBing(result.getLinBing()); + checkupResult.setXiongTou(result.getXiongTou()); +// checkupResult.setJianChaJieGuo(result.getJianChaJieGuo()); +// checkupResult.setJianChaDetails(result.getJianChaDetails()); +// checkupResult.setJiBingZhenDuan(result.getJiBingZhenDuan()); +// checkupResult.setYiXueYiJian(result.getYiXueYiJian()); +// checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails()); +// checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian()); + + return checkupResult; + } + + private static String strPj(String dstStr,String str) + { + String result = ""; + if (StringUtils.isNotEmpty(str)) + { + if (dstStr.contains("(") && dstStr.contains(")")) + { + result += dstStr.substring(0,dstStr.indexOf(")"))+"、"+str+")"; + } + else + { + result = "("+str+")"; + } + } + else + { + return dstStr; + } + return result; + } + + private String itemHandle(Integer status,String detail) + { + String result = ""; + if (status != null && status == 1) + { + result+="异常"; + String content = ""; + if (detail != null) + { + content = strPj(content,detail); + } + if (StringUtils.isNotEmpty(content)) + { + result+=content; + } + } + if (status != null && status == 2) + { + result+="正常"; + } + return result; + } + + public static void main(String[] args) + { + String str = strPj("","ccc"); + System.out.println(str); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 2032745..160ac07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -547,10 +547,18 @@ public class BabyPageResult implements IBasicResultConvert