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 1672df3..38002ce 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 @@ -7,6 +7,7 @@ import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.Map; /** * 婚前检查(男/女) @@ -66,8 +67,8 @@ public class PremaritalCheckup extends BaseModel { private String menstrualAmount; //末次月经 private String lastMenses; - //痛经(1:有 2:无) - private String menorrhalgia; + //痛经(1:有 2:无)（1:无 2:轻 3:中 4:重） + private Integer menorrhalgia; //人流 private Integer renLiu; @@ -185,8 +186,10 @@ public class PremaritalCheckup extends BaseModel { private Integer zaYin; //杂音详情 private String zaYinDetails; - //肝 - private String gan; + //肝(1:未及 2:可及) + private Integer gan; + //肝可及详情 + private String ganDetails; //脾 private String pi; //体格检查其他 @@ -348,11 +351,11 @@ public class PremaritalCheckup extends BaseModel { /***********新增（gxk）***********/ //既往病史 - private String maritalBingHistory; + private Map maritalBingHistory; //手术史(1:有 2:无 3:其他) - private String surgeryHistory; + private Map surgeryHistory; //现病史 - private String nowBingHistory; + private Map nowBingHistory; //足月 private Integer zuyue; //早产 @@ -360,15 +363,19 @@ public class PremaritalCheckup extends BaseModel { //流产 private Integer liuchan; //家庭史 - private String familyHistory; + private Map familyHistory; //智力(1:异常 2:正常) private Integer intelligence; + //智力详情 + private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) private Integer pfmf; //五官（1: 异常 2: 正常） private Integer wuguan; - //四肢脊柱 - private String siZhiJiZhu; + //四肢脊柱（1: 异常 2: 正常） + private Integer siZhiJiZhu; + //四肢脊柱详情 + private String siZhiJiZhuDetails; //体积左 private String volumeLeft; //体积右 @@ -391,14 +398,22 @@ public class PremaritalCheckup extends BaseModel { this.volumeRight = volumeRight; } - public String getSiZhiJiZhu() { + public Integer getSiZhiJiZhu() { return siZhiJiZhu; } - public void setSiZhiJiZhu(String siZhiJiZhu) { + public void setSiZhiJiZhu(Integer siZhiJiZhu) { this.siZhiJiZhu = siZhiJiZhu; } + public String getSiZhiJiZhuDetails() { + return siZhiJiZhuDetails; + } + + public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) { + this.siZhiJiZhuDetails = siZhiJiZhuDetails; + } + public Integer getWuguan() { return wuguan; } @@ -423,11 +438,19 @@ public class PremaritalCheckup extends BaseModel { this.intelligence = intelligence; } - public String getFamilyHistory() { + public String getIntelligenceDetails() { + return intelligenceDetails; + } + + public void setIntelligenceDetails(String intelligenceDetails) { + this.intelligenceDetails = intelligenceDetails; + } + + public Map getFamilyHistory() { return familyHistory; } - public void setFamilyHistory(String familyHistory) { + public void setFamilyHistory(Map familyHistory) { this.familyHistory = familyHistory; } @@ -455,27 +478,27 @@ public class PremaritalCheckup extends BaseModel { this.liuchan = liuchan; } - public String getNowBingHistory() { + public Map getNowBingHistory() { return nowBingHistory; } - public void setNowBingHistory(String nowBingHistory) { + public void setNowBingHistory(Map nowBingHistory) { this.nowBingHistory = nowBingHistory; } - public String getSurgeryHistory() { + public Map getSurgeryHistory() { return surgeryHistory; } - public void setSurgeryHistory(String surgeryHistory) { + public void setSurgeryHistory(Map surgeryHistory) { this.surgeryHistory = surgeryHistory; } - public String getMaritalBingHistory() { + public Map getMaritalBingHistory() { return maritalBingHistory; } - public void setMaritalBingHistory(String maritalBingHistory) { + public void setMaritalBingHistory(Map maritalBingHistory) { this.maritalBingHistory = maritalBingHistory; } @@ -679,11 +702,11 @@ public class PremaritalCheckup extends BaseModel { this.lastMenses = lastMenses; } - public String getMenorrhalgia() { + public Integer getMenorrhalgia() { return menorrhalgia; } - public void setMenorrhalgia(String menorrhalgia) { + public void setMenorrhalgia(Integer menorrhalgia) { this.menorrhalgia = menorrhalgia; } @@ -1119,14 +1142,22 @@ public class PremaritalCheckup extends BaseModel { this.zaYinDetails = zaYinDetails; } - public String getGan() { + public Integer getGan() { return gan; } - public void setGan(String gan) { + public void setGan(Integer gan) { this.gan = gan; } + public String getGanDetails() { + return ganDetails; + } + + public void setGanDetails(String ganDetails) { + this.ganDetails = ganDetails; + } + public String getPi() { return pi; } 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 13de208..45120ea 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 @@ -294,6 +294,7 @@ public class PremaritalCheckupFacade { checkupResult.setZaYin(result.getZaYin()); checkupResult.setZaYinDetails(result.getZaYinDetails()); checkupResult.setGan(result.getGan()); + checkupResult.setGanDetails(result.getGanDetails()); checkupResult.setPi(result.getPi()); checkupResult.setTiGeQiTa(result.getTiGeQiTa()); @@ -390,6 +391,7 @@ public class PremaritalCheckupFacade { checkupResult.setPfmf(result.getPfmf()); checkupResult.setWuguan(result.getWuguan()); checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu()); + checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails()); checkupResult.setVolumeLeft(result.getVolumeLeft()); checkupResult.setVolumeRight(result.getVolumeRight()); @@ -571,6 +573,8 @@ public class PremaritalCheckupFacade { checkup.setFamilyHistory(addRequest.getFamilyHistory()); //智力 checkup.setIntelligence(addRequest.getIntelligence()); + //智力详情 + checkup.setIntelligenceDetails(addRequest.getIntelligenceDetails()); //皮肤毛发 checkup.setPfmf(addRequest.getPfmf()); //五官 @@ -1012,7 +1016,7 @@ public class PremaritalCheckupFacade { map.put("menstrualCycle", checkup.getMenstrualCycle()); map.put("menstrualAmount", checkup.getMenstrualAmount()); map.put("lastMenses", checkup.getLastMenses()); - map.put("menorrhalgia", FunvCommonUtil.havaOrNOString(checkup.getMenorrhalgia(), one)); + map.put("menorrhalgia", FunvCommonUtil.havaOrNOString(checkup.getMenorrhalgia().toString(), one)); map.put("renLiu", checkup.getRenLiu()); map.put("maritalHistory", FunvCommonUtil.havaOrNOInteger(checkup.getMaritalHistory(), one)); map.put("sangOu", FunvCommonUtil.havaOrNOInteger(checkup.getSangOu(), three)); @@ -2179,10 +2183,11 @@ public class PremaritalCheckupFacade { checkupResult.setJiaZhuangXian(itemHandle(result.getJiaZhuangXian(),result.getJiaZhuangXianDetails())); checkupResult.setXiongKuo(itemHandle(result.getXiongKuo(), result.getXiongKuoDetails())); checkupResult.setFei(itemHandle(result.getFei(), result.getFeiDetails())); - checkupResult.setHeartRate(UnitHandle(result.getHeartRate(),UnitConstants.CIFEN)); + checkupResult.setHeartRate(UnitHandle(result.getHeartRate(), UnitConstants.CIFEN)); checkupResult.setHeartRhythm(StringUtils.isNotEmpty(result.getHeartRhythm()) ? result.getHeartRhythm() : ""); checkupResult.setZaYin(itemHandle(result.getZaYin(), result.getZaYinDetails())); checkupResult.setGan(result.getGan()); + checkupResult.setGanDetails(result.getGanDetails()); checkupResult.setPi(result.getPi()); checkupResult.setTiGeQiTa(result.getTiGeQiTa()); 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 6ec75cc..72b4a88 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 @@ -3,6 +3,8 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.pojo.DoctorModel; +import java.util.Map; + /** * 婚前检查请求数据 * @@ -49,20 +51,20 @@ public class PremaritalCheckupAddRequest { private String menstrualAmount; //末次月经 private String lastMenses; - //痛经 - private String menorrhalgia; + //痛经（1:无 2:轻 3:中 4:重） + private Integer menorrhalgia; //人流 private Integer renLiu; //既往病史 - private String maritalBingHistory; + private Map maritalBingHistory; //手术史 - private String surgeryHistory; + private Map surgeryHistory; //现病史 - private String nowBingHistory; + private Map nowBingHistory; //家庭史 - private String familyHistory; + private Map familyHistory; //与本人关系 private String relationWithMe; @@ -109,8 +111,12 @@ public class PremaritalCheckupAddRequest { private String yuYanNengLiDetails; //智力(1:异常 2:正常) private Integer intelligence; + //智力详情 + private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) private Integer pfmf; + //皮肤毛发详情 + private String pfmfDetails; //特殊面容(1: 异常 2: 正常) private Integer teShuMianRong; //特殊面容详情 @@ -121,6 +127,8 @@ public class PremaritalCheckupAddRequest { private String teShuTiTaiDetails; //五官（1: 异常 2: 正常） private Integer wuguan; + //五官详情 + private String wuguanDetails; //身高 private String height; //体重 @@ -198,16 +206,20 @@ public class PremaritalCheckupAddRequest { private Integer zaYin; //杂音详情 private String zaYinDetails; - //肝 - private String gan; + //肝(1:未及 2:可及) + private Integer gan; + //肝可及详情 + private String ganDetails; //脾 private String pi; //体格检查其他 private String tiGeQiTa; //体格检查医生签字 private String tiGeSign; - //四肢脊柱 - private String siZhiJiZhu; + //四肢脊柱(1: 异常 2: 正常) + private Integer siZhiJiZhu; + //四肢脊柱详情 + private String siZhiJiZhuDetails; /****************** 生殖检查 ********************/ /* 第二特征 */ //体态(1: 异常 2: 正常) @@ -386,14 +398,102 @@ public class PremaritalCheckupAddRequest { private Integer sexType; - public String getSiZhiJiZhu() { + 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 Integer getIntelligence() { + return intelligence; + } + + public void setIntelligence(Integer intelligence) { + this.intelligence = intelligence; + } + + public String getIntelligenceDetails() { + return intelligenceDetails; + } + + public void setIntelligenceDetails(String intelligenceDetails) { + this.intelligenceDetails = intelligenceDetails; + } + + public String getPfmfDetails() { + return pfmfDetails; + } + + public void setPfmfDetails(String pfmfDetails) { + this.pfmfDetails = pfmfDetails; + } + + public String getWuguanDetails() { + return wuguanDetails; + } + + public void setWuguanDetails(String wuguanDetails) { + this.wuguanDetails = wuguanDetails; + } + + public Integer getGan() { + return gan; + } + + public void setGan(Integer gan) { + this.gan = gan; + } + + public String getGanDetails() { + return ganDetails; + } + + public void setGanDetails(String ganDetails) { + this.ganDetails = ganDetails; + } + + public Integer getSiZhiJiZhu() { return siZhiJiZhu; } - public void setSiZhiJiZhu(String siZhiJiZhu) { + public void setSiZhiJiZhu(Integer siZhiJiZhu) { this.siZhiJiZhu = siZhiJiZhu; } + public String getSiZhiJiZhuDetails() { + return siZhiJiZhuDetails; + } + + public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) { + this.siZhiJiZhuDetails = siZhiJiZhuDetails; + } + public Integer getPfmf() { return pfmf; } @@ -554,11 +654,11 @@ public class PremaritalCheckupAddRequest { this.lastMenses = lastMenses; } - public String getMenorrhalgia() { + public Integer getMenorrhalgia() { return menorrhalgia; } - public void setMenorrhalgia(String menorrhalgia) { + public void setMenorrhalgia(Integer menorrhalgia) { this.menorrhalgia = menorrhalgia; } @@ -1011,13 +1111,6 @@ public class PremaritalCheckupAddRequest { this.zaYinDetails = zaYinDetails; } - public String getGan() { - return gan; - } - - public void setGan(String gan) { - this.gan = gan; - } public String getPi() { return pi; @@ -1557,37 +1650,6 @@ public class PremaritalCheckupAddRequest { //新增 - 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; @@ -1637,14 +1699,6 @@ public class PremaritalCheckupAddRequest { this.oneDoctorSign = oneDoctorSign; } - public Integer getIntelligence() { - return intelligence; - } - - public void setIntelligence(Integer intelligence) { - this.intelligence = intelligence; - } - public Integer getWuguan() { return wuguan; } 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 65c305b..bb3926d 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 @@ -171,8 +171,10 @@ public class PremaritalCheckupPageResult { //杂音(1: 异常 2: 正常) private String zaYin; - //肝 - private String gan; + //肝(1:未及 2:可及) + private Integer gan; + //肝可及详情 + private String ganDetails; //脾 private String pi; //体格检查其他 @@ -665,14 +667,22 @@ public class PremaritalCheckupPageResult { this.zaYin = zaYin; } - public String getGan() { + public Integer getGan() { return gan; } - public void setGan(String gan) { + public void setGan(Integer gan) { this.gan = gan; } + public String getGanDetails() { + return ganDetails; + } + + public void setGanDetails(String ganDetails) { + this.ganDetails = ganDetails; + } + public String getPi() { return pi; } 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 0772d44..c586f5a 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.pojo.DoctorModel; import java.util.Date; +import java.util.Map; /** * Created by Administrator on 2016/12/15 0015. @@ -51,8 +52,8 @@ public class PremaritalCheckupResult { private String menstrualAmount; //末次月经 private String lastMenses; - //痛经(1:有 2:无) - private String menorrhalgia; + //痛经(1:有 2:无) （1:无 2:轻 3:中 4:重） + private Integer menorrhalgia; //人流 private Integer renLiu; @@ -170,8 +171,10 @@ public class PremaritalCheckupResult { private Integer zaYin; //杂音详情 private String zaYinDetails; - //肝 - private String gan; + //肝(1:未及 2:可及) + private Integer gan; + //肝可及详情 + private String ganDetails; //脾 private String pi; //体格检查其他 @@ -333,11 +336,11 @@ public class PremaritalCheckupResult { /**********新增***********/ //既往病史 - private String maritalBingHistory; + private Map maritalBingHistory; //手术史(1:有 2:无 3:其他) - private String surgeryHistory; + private Map surgeryHistory; //现病史 - private String nowBingHistory; + private Map nowBingHistory; //足月 private Integer zuyue; //早产 @@ -345,45 +348,101 @@ public class PremaritalCheckupResult { //流产 private Integer liuchan; //家庭史 - private String familyHistory; + private Map familyHistory; //智力(1:异常 2:正常) private Integer intelligence; + //智力详情 + private String intelligenceDetails; //皮肤毛发(1:异常 2:正常) private Integer pfmf; + //皮肤毛发详情 + private String pfmfDetails; //五官（1: 异常 2: 正常） private Integer wuguan; - //四肢脊柱 - private String siZhiJiZhu; + //五官详情 + private String wuguanDetails; + //四肢脊柱（1: 异常 2: 正常） + private Integer siZhiJiZhu; + //四肢脊柱详情 + private String siZhiJiZhuDetails; //体积左 private String volumeLeft; //体积右 private String volumeRight; - public String getMaritalBingHistory() { + public String getGanDetails() { + return ganDetails; + } + + public void setGanDetails(String ganDetails) { + this.ganDetails = ganDetails; + } + + public Map getMaritalBingHistory() { return maritalBingHistory; } - public void setMaritalBingHistory(String maritalBingHistory) { + public void setMaritalBingHistory(Map maritalBingHistory) { this.maritalBingHistory = maritalBingHistory; } - public String getSurgeryHistory() { + public Map getSurgeryHistory() { return surgeryHistory; } - public void setSurgeryHistory(String surgeryHistory) { + public void setSurgeryHistory(Map surgeryHistory) { this.surgeryHistory = surgeryHistory; } - public String getNowBingHistory() { + public Map getNowBingHistory() { return nowBingHistory; } - public void setNowBingHistory(String nowBingHistory) { + public void setNowBingHistory(Map nowBingHistory) { this.nowBingHistory = nowBingHistory; } + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + + public String getIntelligenceDetails() { + return intelligenceDetails; + } + + public void setIntelligenceDetails(String intelligenceDetails) { + this.intelligenceDetails = intelligenceDetails; + } + + public String getPfmfDetails() { + return pfmfDetails; + } + + public void setPfmfDetails(String pfmfDetails) { + this.pfmfDetails = pfmfDetails; + } + + public String getWuguanDetails() { + return wuguanDetails; + } + + public void setWuguanDetails(String wuguanDetails) { + this.wuguanDetails = wuguanDetails; + } + + public String getSiZhiJiZhuDetails() { + return siZhiJiZhuDetails; + } + + public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) { + this.siZhiJiZhuDetails = siZhiJiZhuDetails; + } + public Integer getZuyue() { return zuyue; } @@ -408,14 +467,6 @@ public class PremaritalCheckupResult { this.liuchan = liuchan; } - public String getFamilyHistory() { - return familyHistory; - } - - public void setFamilyHistory(String familyHistory) { - this.familyHistory = familyHistory; - } - public Integer getIntelligence() { return intelligence; } @@ -440,11 +491,11 @@ public class PremaritalCheckupResult { this.wuguan = wuguan; } - public String getSiZhiJiZhu() { + public Integer getSiZhiJiZhu() { return siZhiJiZhu; } - public void setSiZhiJiZhu(String siZhiJiZhu) { + public void setSiZhiJiZhu(Integer siZhiJiZhu) { this.siZhiJiZhu = siZhiJiZhu; } @@ -616,11 +667,11 @@ public class PremaritalCheckupResult { this.lastMenses = lastMenses; } - public String getMenorrhalgia() { + public Integer getMenorrhalgia() { return menorrhalgia; } - public void setMenorrhalgia(String menorrhalgia) { + public void setMenorrhalgia(Integer menorrhalgia) { this.menorrhalgia = menorrhalgia; } @@ -1056,11 +1107,11 @@ public class PremaritalCheckupResult { this.zaYinDetails = zaYinDetails; } - public String getGan() { + public Integer getGan() { return gan; } - public void setGan(String gan) { + public void setGan(Integer gan) { this.gan = gan; }