From 295cedb25cec7addcab93a47f5d3927b0f94017a Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 10 Oct 2018 15:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/PremaritalCheckup.java | 77 ++++++++++++++++------ .../web/facade/PremaritalCheckupFacade.java | 50 ++++++++++---- .../web/request/PremaritalCheckupAddRequest.java | 30 ++++----- .../web/result/PremaritalCheckupPageResult.java | 65 ++++++++++++++++-- .../web/result/PremaritalCheckupResult.java | 62 +++++++++++------ 5 files changed, 212 insertions(+), 72 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index d506886..4ad523b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -351,15 +351,19 @@ public class PremaritalCheckup extends BaseModel { private String zhiDaoYiJian; //婚检医生 private String hunJianDoctor; + //婚前卫生咨询 + private String hunqianHealth; + //咨询指导结果 + private String guidanceResults; /***********新增（gxk）***********/ //既往病史 - private Map maritalBingHistory; + private Map maritalBingHistory; //手术史(1:有 2:无 3:其他) - private Map surgeryHistory; + private Map surgeryHistory; //现病史 - private Map nowBingHistory; + private Map nowBingHistory; //足月 private Integer zuyue; //早产 @@ -367,15 +371,19 @@ public class PremaritalCheckup extends BaseModel { //流产 private Integer liuchan; //家庭史 - private Map familyHistory; + private Map familyHistory; //智力(1:异常 2:正常) - private Map intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) private Integer pfmf; + //皮肤毛发详情 + private String pfmfDetails; //五官（1: 异常 2: 正常） private Integer wuguan; + //五官详情 + private String wuguanDetails; //四肢脊柱（1: 异常 2: 正常） private Integer siZhiJiZhu; //四肢脊柱详情 @@ -426,6 +434,14 @@ public class PremaritalCheckup extends BaseModel { this.wuguan = wuguan; } + public String getWuguanDetails() { + return wuguanDetails; + } + + public void setWuguanDetails(String wuguanDetails) { + this.wuguanDetails = wuguanDetails; + } + public Integer getPfmf() { return pfmf; } @@ -434,11 +450,19 @@ public class PremaritalCheckup extends BaseModel { this.pfmf = pfmf; } - public Map getIntelligence() { + public String getPfmfDetails() { + return pfmfDetails; + } + + public void setPfmfDetails(String pfmfDetails) { + this.pfmfDetails = pfmfDetails; + } + + public Map getIntelligence() { return intelligence; } - public void setIntelligence(Map intelligence) { + public void setIntelligence(Map intelligence) { this.intelligence = intelligence; } @@ -450,11 +474,11 @@ public class PremaritalCheckup extends BaseModel { this.intelligenceDetails = intelligenceDetails; } - public Map getFamilyHistory() { + public Map getFamilyHistory() { return familyHistory; } - public void setFamilyHistory(Map familyHistory) { + public void setFamilyHistory(Map familyHistory) { this.familyHistory = familyHistory; } @@ -482,28 +506,28 @@ public class PremaritalCheckup extends BaseModel { this.liuchan = liuchan; } - public Map getNowBingHistory() { - return nowBingHistory; + public Map getMaritalBingHistory() { + return maritalBingHistory; } - public void setNowBingHistory(Map nowBingHistory) { - this.nowBingHistory = nowBingHistory; + public void setMaritalBingHistory(Map maritalBingHistory) { + this.maritalBingHistory = maritalBingHistory; } - public Map getSurgeryHistory() { + public Map getSurgeryHistory() { return surgeryHistory; } - public void setSurgeryHistory(Map surgeryHistory) { + public void setSurgeryHistory(Map surgeryHistory) { this.surgeryHistory = surgeryHistory; } - public Map getMaritalBingHistory() { - return maritalBingHistory; + public Map getNowBingHistory() { + return nowBingHistory; } - public void setMaritalBingHistory(Map maritalBingHistory) { - this.maritalBingHistory = maritalBingHistory; + public void setNowBingHistory(Map nowBingHistory) { + this.nowBingHistory = nowBingHistory; } public Integer getSexType() { @@ -1714,4 +1738,19 @@ public class PremaritalCheckup extends BaseModel { this.hunJianDoctor = hunJianDoctor; } + public String getHunqianHealth() { + return hunqianHealth; + } + + public void setHunqianHealth(String hunqianHealth) { + this.hunqianHealth = hunqianHealth; + } + + public String getGuidanceResults() { + return guidanceResults; + } + + public void setGuidanceResults(String guidanceResults) { + this.guidanceResults = guidanceResults; + } } 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 197a8ee..d4bf2be 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 @@ -369,17 +369,18 @@ public class PremaritalCheckupFacade { checkupResult.setYiXueYiJian(result.getYiXueYiJian()); checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails()); checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian()); - String hunJianDoctor = ""; + /*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(result.getHunJianDoctor()); - checkupResult.setHunJianDoctor(hunJianDoctor); + }*/ + checkupResult.setHunJianDoctor(result.getHunJianDoctor()); + // checkupResult.setHunJianDoctor(hunJianDoctor); //新增字段赋值 + checkupResult.setBloodshed(result.getBloodshed()); checkupResult.setMaritalBingHistory(result.getMaritalBingHistory()); checkupResult.setSurgeryHistory(result.getSurgeryHistory()); checkupResult.setNowBingHistory(result.getNowBingHistory()); @@ -389,13 +390,18 @@ public class PremaritalCheckupFacade { checkupResult.setFamilyHistory(result.getFamilyHistory()); checkupResult.setIntelligence(result.getIntelligence()); checkupResult.setPfmf(result.getPfmf()); + checkupResult.setPfmfDetails(result.getPfmfDetails()); checkupResult.setWuguan(result.getWuguan()); + checkupResult.setWuguanDetails(result.getWuguanDetails()); checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu()); checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails()); checkupResult.setVolumeLeft(result.getVolumeLeft()); checkupResult.setVolumeRight(result.getVolumeRight()); checkupResult.setPosition(result.getPosition()); checkupResult.setDegree(result.getDegree()); + checkupResult.setGanDetails(result.getGanDetails()); + checkupResult.setHunqianHealth(result.getHunqianHealth()); + checkupResult.setGuidanceResults(result.getGuidanceResults()); return checkupResult; } @@ -559,6 +565,8 @@ public class PremaritalCheckupFacade { } //血缘关系 checkup.setIsBloodshed(addRequest.getIsBloodshed()); + //血缘详情 + checkup.setBloodshed(addRequest.getBloodshed()); //既往病史 checkup.setMaritalBingHistory(addRequest.getMaritalBingHistory()); //手术史 @@ -579,10 +587,16 @@ public class PremaritalCheckupFacade { checkup.setIntelligenceDetails(addRequest.getIntelligenceDetails()); //皮肤毛发 checkup.setPfmf(addRequest.getPfmf()); + //皮肤毛发详情 + checkup.setPfmfDetails(addRequest.getPfmfDetails()); //五官 checkup.setWuguan(addRequest.getWuguan()); + //五官详情 + checkup.setWuguanDetails(addRequest.getWuguanDetails()); //四肢脊柱 checkup.setSiZhiJiZhu(addRequest.getSiZhiJiZhu()); + //四肢脊柱详情 + checkup.setSiZhiJiZhuDetails(addRequest.getSiZhiJiZhuDetails()); //双侧扪及左体积 checkup.setVolumeLeft(addRequest.getVolumeLeft()); //双侧扪及右体积 @@ -591,7 +605,12 @@ public class PremaritalCheckupFacade { checkup.setPosition(addRequest.getPosition()); //程度 checkup.setDegree(addRequest.getDegree()); - + //肝详情 + checkup.setGanDetails(addRequest.getGanDetails()); + //婚前卫生咨询 + checkup.setHunqianHealth(addRequest.getHunqianHealth()); + //咨询指导结果 + checkup.setGuidanceResults(addRequest.getGuidanceResults()); /* 婚育史 */ @@ -1862,7 +1881,7 @@ public class PremaritalCheckupFacade { checkupResult.setSpouseName(result.getSpouseName()); checkupResult.setSpouseCertificateType(getBaseicConfigByid(result.getSpouseCertificateTypeId())); checkupResult.setSpouseCertificateNum(result.getSpouseCertificateNum()); - String isBloodshed= ""; + /*String isBloodshed= ""; if (result.getIsBloodshed() != null && 1 == result.getIsBloodshed()) { isBloodshed = "有"; @@ -1870,8 +1889,11 @@ public class PremaritalCheckupFacade { else if (result.getIsBloodshed() != null && 2 == result.getIsBloodshed()) { isBloodshed = "无"; - } - checkupResult.setIsBloodshed(isBloodshed); + }*/ + + //新增血缘关系 + checkupResult.setIsBloodshed(result.getIsBloodshed()); + checkupResult.setBloodshed(result.getBloodshed()); checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime())); String hunJianDoctor = ""; @@ -1882,6 +1904,7 @@ public class PremaritalCheckupFacade { } } checkupResult.setHunJianDoctor(hunJianDoctor); + //checkupResult.setHunJianDoctor(result.getHunJianDoctor()); //查询的时候,返回医院的名称 if (result.getHospitalId()!=null){ @@ -1899,7 +1922,7 @@ public class PremaritalCheckupFacade { checkupResult.setMenstrualAmount(result.getMenstrualAmount()); checkupResult.setLastMenses(result.getLastMenses()); - String menorrhalgia= ""; + /*String menorrhalgia= ""; if (result.getMenorrhalgia() != null && "1".equals(result.getMenorrhalgia())) { menorrhalgia = "有"; @@ -1907,8 +1930,9 @@ public class PremaritalCheckupFacade { else if (result.getMenorrhalgia() != null && "2".equals(result.getMenorrhalgia())) { menorrhalgia = "无"; - } - checkupResult.setMenorrhalgia(menorrhalgia); + }*/ + //修改痛经赋值和数据类型 + checkupResult.setMenorrhalgia(result.getMenorrhalgia()); if (result.getRenLiu() != null) { @@ -2406,6 +2430,10 @@ public class PremaritalCheckupFacade { } checkupResult.setYiXueYiJian(yxyj); checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian()); + + //新增 + checkupResult.setMaritalBingHistory(result.getMaritalBingHistory()); + return checkupResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index ae8497c..f125613 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -58,13 +58,13 @@ public class PremaritalCheckupAddRequest { //既往病史 - private Map maritalBingHistory; + private Map maritalBingHistory; //手术史 - private Map surgeryHistory; + private Map surgeryHistory; //现病史 - private Map nowBingHistory; + private Map nowBingHistory; //家庭史 - private Map familyHistory; + private Map familyHistory; //与本人关系 private String relationWithMe; @@ -110,7 +110,7 @@ public class PremaritalCheckupAddRequest { //语言能力异常详情 private String yuYanNengLiDetails; //智力(1:异常 2:正常) - private Map intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) @@ -402,43 +402,43 @@ public class PremaritalCheckupAddRequest { private Integer sexType; - public Map getMaritalBingHistory() { + public Map getMaritalBingHistory() { return maritalBingHistory; } - public void setMaritalBingHistory(Map maritalBingHistory) { + public void setMaritalBingHistory(Map maritalBingHistory) { this.maritalBingHistory = maritalBingHistory; } - public Map getSurgeryHistory() { + public Map getSurgeryHistory() { return surgeryHistory; } - public void setSurgeryHistory(Map surgeryHistory) { + public void setSurgeryHistory(Map surgeryHistory) { this.surgeryHistory = surgeryHistory; } - public Map getNowBingHistory() { + public Map getNowBingHistory() { return nowBingHistory; } - public void setNowBingHistory(Map nowBingHistory) { + public void setNowBingHistory(Map nowBingHistory) { this.nowBingHistory = nowBingHistory; } - public Map getFamilyHistory() { + public Map getFamilyHistory() { return familyHistory; } - public void setFamilyHistory(Map familyHistory) { + public void setFamilyHistory(Map familyHistory) { this.familyHistory = familyHistory; } - public Map getIntelligence() { + public Map getIntelligence() { return intelligence; } - public void setIntelligence(Map intelligence) { + public void setIntelligence(Map intelligence) { this.intelligence = intelligence; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java index bb3926d..5195f2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.result; +import java.util.Map; /** * Created by Administrator on 2016/12/15 0015. @@ -53,7 +54,9 @@ public class PremaritalCheckupPageResult { //配偶证件号 private String spouseCertificateNum; //血缘关系(1: 有 2: 无) - private String isBloodshed; + private Integer isBloodshed; + //血缘详情 + private String Bloodshed; /****婚检信息 ***/ @@ -81,7 +84,7 @@ public class PremaritalCheckupPageResult { //末次月经 private String lastMenses; //痛经(1:有 2:无) - private String menorrhalgia; + private Integer menorrhalgia; //人流 private String renLiu; @@ -321,6 +324,48 @@ public class PremaritalCheckupPageResult { //指导意见 private String zhiDaoYiJian; + //xinzeng + //既往病史 + private Map maritalBingHistory; + //手术史 + private Map surgeryHistory; + //现病史 + private Map nowBingHistory; + //家庭史 + private Map familyHistory; + + public Map getMaritalBingHistory() { + return maritalBingHistory; + } + + public void setMaritalBingHistory(Map maritalBingHistory) { + this.maritalBingHistory = maritalBingHistory; + } + + public Map getSurgeryHistory() { + return surgeryHistory; + } + + public void setSurgeryHistory(Map surgeryHistory) { + this.surgeryHistory = surgeryHistory; + } + + public Map getNowBingHistory() { + return nowBingHistory; + } + + public void setNowBingHistory(Map nowBingHistory) { + this.nowBingHistory = nowBingHistory; + } + + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + public String getUsername() { return username; } @@ -393,14 +438,22 @@ public class PremaritalCheckupPageResult { this.spouseCertificateNum = spouseCertificateNum; } - public String getIsBloodshed() { + public Integer getIsBloodshed() { return isBloodshed; } - public void setIsBloodshed(String isBloodshed) { + public void setIsBloodshed(Integer isBloodshed) { this.isBloodshed = isBloodshed; } + public String getBloodshed() { + return Bloodshed; + } + + public void setBloodshed(String bloodshed) { + Bloodshed = bloodshed; + } + public String getHunJianDate() { return hunJianDate; } @@ -457,11 +510,11 @@ public class PremaritalCheckupPageResult { this.lastMenses = lastMenses; } - public String getMenorrhalgia() { + public Integer getMenorrhalgia() { return menorrhalgia; } - public void setMenorrhalgia(String menorrhalgia) { + public void setMenorrhalgia(Integer menorrhalgia) { this.menorrhalgia = menorrhalgia; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 9093fa0..24e77ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -332,15 +332,19 @@ public class PremaritalCheckupResult { private String zhiDaoYiJian; //婚检医生 private String hunJianDoctor; + //婚前卫生咨询 + private String hunqianHealth; + //咨询指导结果 + private String guidanceResults; /**********新增***********/ //既往病史 - private Map maritalBingHistory; + private Map maritalBingHistory; //手术史(1:有 2:无 3:其他) - private Map surgeryHistory; + private Map surgeryHistory; //现病史 - private Map nowBingHistory; + private Map nowBingHistory; //足月 private Integer zuyue; //早产 @@ -348,9 +352,9 @@ public class PremaritalCheckupResult { //流产 private Integer liuchan; //家庭史 - private Map familyHistory; + private Map familyHistory; //智力(1:异常 2:正常) - private Map intelligence; + private Map intelligence; //智力详情 private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) @@ -398,38 +402,46 @@ public class PremaritalCheckupResult { this.ganDetails = ganDetails; } - public Map getMaritalBingHistory() { + public Map getMaritalBingHistory() { return maritalBingHistory; } - public void setMaritalBingHistory(Map maritalBingHistory) { + public void setMaritalBingHistory(Map maritalBingHistory) { this.maritalBingHistory = maritalBingHistory; } - public Map getSurgeryHistory() { + public Map getSurgeryHistory() { return surgeryHistory; } - public void setSurgeryHistory(Map surgeryHistory) { + public void setSurgeryHistory(Map surgeryHistory) { this.surgeryHistory = surgeryHistory; } - public Map getNowBingHistory() { + public Map getNowBingHistory() { return nowBingHistory; } - public void setNowBingHistory(Map nowBingHistory) { + public void setNowBingHistory(Map nowBingHistory) { this.nowBingHistory = nowBingHistory; } - public Map getFamilyHistory() { + public Map getFamilyHistory() { return familyHistory; } - public void setFamilyHistory(Map familyHistory) { + public void setFamilyHistory(Map familyHistory) { this.familyHistory = familyHistory; } + public Map getIntelligence() { + return intelligence; + } + + public void setIntelligence(Map intelligence) { + this.intelligence = intelligence; + } + public String getIntelligenceDetails() { return intelligenceDetails; } @@ -486,14 +498,6 @@ public class PremaritalCheckupResult { this.liuchan = liuchan; } - public Map getIntelligence() { - return intelligence; - } - - public void setIntelligence(Map intelligence) { - this.intelligence = intelligence; - } - public Integer getPfmf() { return pfmf; } @@ -1693,4 +1697,20 @@ public class PremaritalCheckupResult { public void setHunJianDoctor(String hunJianDoctor) { this.hunJianDoctor = hunJianDoctor; } + + public String getHunqianHealth() { + return hunqianHealth; + } + + public void setHunqianHealth(String hunqianHealth) { + this.hunqianHealth = hunqianHealth; + } + + public String getGuidanceResults() { + return guidanceResults; + } + + public void setGuidanceResults(String guidanceResults) { + this.guidanceResults = guidanceResults; + } } -- 1.8.3.1