From 0092c9d25c8852393c45f1e9262b70ad557fd6aa Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 9 Oct 2018 11:36:11 +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 | 136 ++++++++++- .../web/facade/PremaritalCheckupFacade.java | 45 ++++ .../web/request/PremaritalCheckupAddRequest.java | 269 ++++++++++++++++++++- .../web/result/PremaritalCheckupResult.java | 134 ++++++++++ 4 files changed, 582 insertions(+), 2 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 d41548d..1672df3 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 @@ -49,7 +49,7 @@ public class PremaritalCheckup extends BaseModel { private String spouseCertificateTypeId; //配偶证件号 private String spouseCertificateNum; - //血缘关系(1: 有 2: 无) + //血缘关系(1: 有 2: 无) （0:无，1:表，2:堂，3:其他） private Integer isBloodshed; //具体血缘关系 private String bloodshed; @@ -345,6 +345,140 @@ public class PremaritalCheckup extends BaseModel { //婚检医生 private String hunJianDoctor; + + /***********新增（gxk）***********/ + //既往病史 + private String maritalBingHistory; + //手术史(1:有 2:无 3:其他) + private String surgeryHistory; + //现病史 + private String nowBingHistory; + //足月 + private Integer zuyue; + //早产 + private Integer zaochan; + //流产 + private Integer liuchan; + //家庭史 + private String familyHistory; + //智力(1:异常 2:正常) + private Integer intelligence; + //皮肤毛发(1:异常 2:正常) + private Integer pfmf; + //五官（1: 异常 2: 正常） + private Integer wuguan; + //四肢脊柱 + private String siZhiJiZhu; + //体积左 + private String volumeLeft; + //体积右 + private String volumeRight; + + + public String getVolumeLeft() { + return volumeLeft; + } + + public void setVolumeLeft(String volumeLeft) { + this.volumeLeft = volumeLeft; + } + + public String getVolumeRight() { + return volumeRight; + } + + public void setVolumeRight(String volumeRight) { + this.volumeRight = volumeRight; + } + + public String getSiZhiJiZhu() { + return siZhiJiZhu; + } + + public void setSiZhiJiZhu(String siZhiJiZhu) { + this.siZhiJiZhu = siZhiJiZhu; + } + + public Integer getWuguan() { + return wuguan; + } + + public void setWuguan(Integer wuguan) { + this.wuguan = wuguan; + } + + public Integer getPfmf() { + return pfmf; + } + + public void setPfmf(Integer pfmf) { + this.pfmf = pfmf; + } + + public Integer getIntelligence() { + return intelligence; + } + + public void setIntelligence(Integer intelligence) { + this.intelligence = intelligence; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public Integer getZuyue() { + return zuyue; + } + + public void setZuyue(Integer zuyue) { + this.zuyue = zuyue; + } + + public Integer getZaochan() { + return zaochan; + } + + public void setZaochan(Integer zaochan) { + this.zaochan = zaochan; + } + + public Integer getLiuchan() { + return liuchan; + } + + public void setLiuchan(Integer liuchan) { + this.liuchan = liuchan; + } + + public String getNowBingHistory() { + return nowBingHistory; + } + + public void setNowBingHistory(String nowBingHistory) { + this.nowBingHistory = nowBingHistory; + } + + public String getSurgeryHistory() { + return surgeryHistory; + } + + public void setSurgeryHistory(String surgeryHistory) { + this.surgeryHistory = surgeryHistory; + } + + public String getMaritalBingHistory() { + return maritalBingHistory; + } + + public void setMaritalBingHistory(String maritalBingHistory) { + this.maritalBingHistory = maritalBingHistory; + } + public Integer getSexType() { return sexType; } 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 0b8b76b..13de208 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 @@ -377,6 +377,22 @@ public class PremaritalCheckupFacade { } // checkupResult.setHunJianDoctor(result.getHunJianDoctor()); checkupResult.setHunJianDoctor(hunJianDoctor); + + //新增字段赋值 + checkupResult.setMaritalBingHistory(result.getMaritalBingHistory()); + checkupResult.setSurgeryHistory(result.getSurgeryHistory()); + checkupResult.setNowBingHistory(result.getNowBingHistory()); + checkupResult.setZuyue(result.getZuyue()); + checkupResult.setZaochan(result.getZaochan()); + checkupResult.setLiuchan(result.getLiuchan()); + checkupResult.setFamilyHistory(result.getFamilyHistory()); + checkupResult.setIntelligence(result.getIntelligence()); + checkupResult.setPfmf(result.getPfmf()); + checkupResult.setWuguan(result.getWuguan()); + checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu()); + checkupResult.setVolumeLeft(result.getVolumeLeft()); + checkupResult.setVolumeRight(result.getVolumeRight()); + return checkupResult; } @@ -537,6 +553,35 @@ public class PremaritalCheckupFacade { } checkup.setDeliverStatus(addRequest.getDeliverStatus()); } + //血缘关系 + checkup.setIsBloodshed(addRequest.getIsBloodshed()); + //既往病史 + checkup.setMaritalBingHistory(addRequest.getMaritalBingHistory()); + //手术史 + checkup.setSurgeryHistory(addRequest.getSurgeryHistory()); + //现病史 + checkup.setNowBingHistory(addRequest.getNowBingHistory()); + //足月 + checkup.setZuyue(addRequest.getZuyue()); + //早产 + checkup.setZaochan(addRequest.getZaochan()); + //流产 + checkup.setLiuchan(addRequest.getLiuchan()); + //家庭史 + checkup.setFamilyHistory(addRequest.getFamilyHistory()); + //智力 + checkup.setIntelligence(addRequest.getIntelligence()); + //皮肤毛发 + checkup.setPfmf(addRequest.getPfmf()); + //五官 + checkup.setWuguan(addRequest.getWuguan()); + //四肢脊柱 + checkup.setSiZhiJiZhu(addRequest.getSiZhiJiZhu()); + //双侧扪及左体积 + checkup.setVolumeLeft(addRequest.getVolumeLeft()); + //双侧扪及右体积 + checkup.setVolumeRight(addRequest.getVolumeRight()); + /* 婚育史 */ //女性 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 5f70fac..6ec75cc 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 @@ -32,7 +32,7 @@ public class PremaritalCheckupAddRequest { private String spouseCertificateTypeId; //配偶证件号 private String spouseCertificateNum; - //血缘关系(1: 有 2: 无) + //血缘关系(1: 有 2: 无) （0:无，1:表，2:堂，3:其他） private Integer isBloodshed; //具体血缘关系 private String bloodshed; @@ -54,6 +54,21 @@ public class PremaritalCheckupAddRequest { //人流 private Integer renLiu; + + //既往病史 + private String maritalBingHistory; + //手术史 + private String surgeryHistory; + //现病史 + private String nowBingHistory; + //家庭史 + private String familyHistory; + //与本人关系 + private String relationWithMe; + + + + /* 男性只有这三种 */ //既往婚育史(1: 有 2: 无) private Integer maritalHistory; @@ -61,6 +76,12 @@ public class PremaritalCheckupAddRequest { private Integer sangOu; //离异(1:是 2:不是) private Integer liYi; + //足月 + private Integer zuyue; + //早产 + private Integer zaochan; + //流产 + private Integer liuchan; //子女(个数) private Integer childrenNum; //家族近亲婚配(1: 有 2: 无) @@ -72,6 +93,10 @@ public class PremaritalCheckupAddRequest { private Integer grandparent; //外祖父母(1:是 2:不是) private Integer maternalGrandparents; + //正页受检者签字 + private String sjzOneSign; + //医生签字 + private String oneDoctorSign; /****************** 体格检查 ********************/ //精神状态(1: 异常 2: 正常) @@ -82,6 +107,10 @@ public class PremaritalCheckupAddRequest { private Integer yuYanNengLi; //语言能力异常详情 private String yuYanNengLiDetails; + //智力(1:异常 2:正常) + private Integer intelligence; + //皮肤毛发(1:异常 2:正常) + private Integer pfmf; //特殊面容(1: 异常 2: 正常) private Integer teShuMianRong; //特殊面容详情 @@ -90,6 +119,8 @@ public class PremaritalCheckupAddRequest { private Integer teShuTiTai; //特殊体态详情 private String teShuTiTaiDetails; + //五官（1: 异常 2: 正常） + private Integer wuguan; //身高 private String height; //体重 @@ -173,6 +204,10 @@ public class PremaritalCheckupAddRequest { private String pi; //体格检查其他 private String tiGeQiTa; + //体格检查医生签字 + private String tiGeSign; + //四肢脊柱 + private String siZhiJiZhu; /****************** 生殖检查 ********************/ /* 第二特征 */ //体态(1: 异常 2: 正常) @@ -215,6 +250,8 @@ public class PremaritalCheckupAddRequest { private String fuJian; //阴道检查其他 private String yinDaoQiTa; + //同意阴道检查，本人签字 + private String sign; /* 生殖器(男) */ //阴茎 private String jBa; @@ -224,6 +261,10 @@ public class PremaritalCheckupAddRequest { private Integer baoPi; //睾丸(单选，选择扪及/未们及) private Integer gaoWan; + //体积左 + private String volumeLeft; + //体积右 + private String volumeRight; //睾丸(左) private String gaoWanZuo; //睾丸(右) @@ -242,6 +283,8 @@ public class PremaritalCheckupAddRequest { private String jingMaiYou; //生殖器其他 private String shengZhiQiTa; + //第二性征检查医生签字 + private String twoSign; /****************** 辅助检查结果 ********************/ /* 血常规 */ //血红蛋白 @@ -320,15 +363,45 @@ public class PremaritalCheckupAddRequest { /****************** 婚前指导 ********************/ //医学意见 private Integer yiXueYiJian; + //婚前卫生咨询 + private String hunqianHealth; + //咨询指导结果 + private String guidanceResults; + //反页受检者签字 + private String sjzTwoSign; //医学意见其他详情 private String yiJianQiTaDetails; //指导意见 private String zhiDaoYiJian; //婚检医生 private String hunJianDoctor; + //转诊医院 + private String referralHospital; + //转诊日期 + private String referralDate; + //出具证明时间 + private String issueTime; + //主检医师签名 + private String doctorSign; private Integer sexType; + public String getSiZhiJiZhu() { + return siZhiJiZhu; + } + + public void setSiZhiJiZhu(String siZhiJiZhu) { + this.siZhiJiZhu = siZhiJiZhu; + } + + public Integer getPfmf() { + return pfmf; + } + + public void setPfmf(Integer pfmf) { + this.pfmf = pfmf; + } + public Integer getSexType() { return sexType; } @@ -1481,4 +1554,198 @@ public class PremaritalCheckupAddRequest { public void setHunJianDoctor(String hunJianDoctor) { this.hunJianDoctor = hunJianDoctor; } + + + //新增 + public String getMaritalBingHistory() { + return maritalBingHistory; + } + + public void setMaritalBingHistory(String maritalBingHistory) { + this.maritalBingHistory = maritalBingHistory; + } + + public String getSurgeryHistory() { + return surgeryHistory; + } + + public void setSurgeryHistory(String surgeryHistory) { + this.surgeryHistory = surgeryHistory; + } + + public String getNowBingHistory() { + return nowBingHistory; + } + + public void setNowBingHistory(String nowBingHistory) { + this.nowBingHistory = nowBingHistory; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public String getRelationWithMe() { + return relationWithMe; + } + + public void setRelationWithMe(String relationWithMe) { + this.relationWithMe = relationWithMe; + } + + public Integer getZuyue() { + return zuyue; + } + + public void setZuyue(Integer zuyue) { + this.zuyue = zuyue; + } + + public Integer getZaochan() { + return zaochan; + } + + public void setZaochan(Integer zaochan) { + this.zaochan = zaochan; + } + + public Integer getLiuchan() { + return liuchan; + } + + public void setLiuchan(Integer liuchan) { + this.liuchan = liuchan; + } + + public String getSjzOneSign() { + return sjzOneSign; + } + + public void setSjzOneSign(String sjzOneSign) { + this.sjzOneSign = sjzOneSign; + } + + public String getOneDoctorSign() { + return oneDoctorSign; + } + + public void setOneDoctorSign(String oneDoctorSign) { + this.oneDoctorSign = oneDoctorSign; + } + + public Integer getIntelligence() { + return intelligence; + } + + public void setIntelligence(Integer intelligence) { + this.intelligence = intelligence; + } + + public Integer getWuguan() { + return wuguan; + } + + public void setWuguan(Integer wuguan) { + this.wuguan = wuguan; + } + + public String getTiGeSign() { + return tiGeSign; + } + + public void setTiGeSign(String tiGeSign) { + this.tiGeSign = tiGeSign; + } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getVolumeLeft() { + return volumeLeft; + } + + public void setVolumeLeft(String volumeLeft) { + this.volumeLeft = volumeLeft; + } + + public String getVolumeRight() { + return volumeRight; + } + + public void setVolumeRight(String volumeRight) { + this.volumeRight = volumeRight; + } + + public String getTwoSign() { + return twoSign; + } + + public void setTwoSign(String twoSign) { + this.twoSign = twoSign; + } + + 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; + } + + public String getSjzTwoSign() { + return sjzTwoSign; + } + + public void setSjzTwoSign(String sjzTwoSign) { + this.sjzTwoSign = sjzTwoSign; + } + + public String getReferralHospital() { + return referralHospital; + } + + public void setReferralHospital(String referralHospital) { + this.referralHospital = referralHospital; + } + + public String getReferralDate() { + return referralDate; + } + + public void setReferralDate(String referralDate) { + this.referralDate = referralDate; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } } 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 b06085a..0772d44 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 @@ -330,6 +330,140 @@ public class PremaritalCheckupResult { //婚检医生 private String hunJianDoctor; + + /**********新增***********/ + //既往病史 + private String maritalBingHistory; + //手术史(1:有 2:无 3:其他) + private String surgeryHistory; + //现病史 + private String nowBingHistory; + //足月 + private Integer zuyue; + //早产 + private Integer zaochan; + //流产 + private Integer liuchan; + //家庭史 + private String familyHistory; + //智力(1:异常 2:正常) + private Integer intelligence; + //皮肤毛发(1:异常 2:正常) + private Integer pfmf; + //五官（1: 异常 2: 正常） + private Integer wuguan; + //四肢脊柱 + private String siZhiJiZhu; + //体积左 + private String volumeLeft; + //体积右 + private String volumeRight; + + + public String getMaritalBingHistory() { + return maritalBingHistory; + } + + public void setMaritalBingHistory(String maritalBingHistory) { + this.maritalBingHistory = maritalBingHistory; + } + + public String getSurgeryHistory() { + return surgeryHistory; + } + + public void setSurgeryHistory(String surgeryHistory) { + this.surgeryHistory = surgeryHistory; + } + + public String getNowBingHistory() { + return nowBingHistory; + } + + public void setNowBingHistory(String nowBingHistory) { + this.nowBingHistory = nowBingHistory; + } + + public Integer getZuyue() { + return zuyue; + } + + public void setZuyue(Integer zuyue) { + this.zuyue = zuyue; + } + + public Integer getZaochan() { + return zaochan; + } + + public void setZaochan(Integer zaochan) { + this.zaochan = zaochan; + } + + public Integer getLiuchan() { + return liuchan; + } + + public void setLiuchan(Integer liuchan) { + this.liuchan = liuchan; + } + + public String getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(String familyHistory) { + this.familyHistory = familyHistory; + } + + public Integer getIntelligence() { + return intelligence; + } + + public void setIntelligence(Integer intelligence) { + this.intelligence = intelligence; + } + + public Integer getPfmf() { + return pfmf; + } + + public void setPfmf(Integer pfmf) { + this.pfmf = pfmf; + } + + public Integer getWuguan() { + return wuguan; + } + + public void setWuguan(Integer wuguan) { + this.wuguan = wuguan; + } + + public String getSiZhiJiZhu() { + return siZhiJiZhu; + } + + public void setSiZhiJiZhu(String siZhiJiZhu) { + this.siZhiJiZhu = siZhiJiZhu; + } + + public String getVolumeLeft() { + return volumeLeft; + } + + public void setVolumeLeft(String volumeLeft) { + this.volumeLeft = volumeLeft; + } + + public String getVolumeRight() { + return volumeRight; + } + + public void setVolumeRight(String volumeRight) { + this.volumeRight = volumeRight; + } + public String getId() { return id; } -- 1.8.3.1