diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml index 87d3b9b..f69c0e2 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml @@ -20,7 +20,7 @@ - + @@ -42,10 +42,67 @@ - - - - ID AS id, WOMAN_ID AS womanId, TYPE AS type, YUN_NUM AS yunNum, CHAN_NUM AS chanNum, SHUN_NUM AS shunNum, PAO_NUM AS paoNum, LIU_NUM AS liuNum, ZIRAN_NUM AS ziranNum, RENGONG_NUM AS rengongNum, SITAI_NUM AS sitaiNum, SICHAN_NUM AS sichanNum, CHILDDIE_NUM AS childdieNum, BIRTHDEFECT_NUM AS birthdefectNum, HEIGHT AS height, WEIGHT AS weight, HEIGHT_AGO AS heightAgo, WEIGHT_INDEX AS weightIndex, BLOOD_SHRINK AS bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, HEART AS heart, LUNG AS lung, WAIYIN_WOMAN AS waiyinWoman, YINDAO_WOMAN AS yindaoWoman, GONGJING_WOMAN AS gongjingWoman, ZIGONG_WOMAN AS zigongWoman, FUJIAN_WOMAN AS fujianWoman, GONGGAO_OBSTETRICS AS gonggaoObstetrics, FUWEI_OBSTETRICS AS fuweiObstetrics, FUZHONG_OBSTETRICS AS fuzhongObstetrics, TAISHU_OBSTETRICS AS taishuObstetrics, DISPOSE_SUGGEST AS disposeSuggest, GUIDE_SUGGEST AS guideSuggest, NEXTINSPECT_NUM AS nextinspectNum, NEXTINSPECT_TIME AS nextinspectTime, DOCTOR_ID AS doctorId, ORG_ID AS orgId, DIAGNOSE_TIME AS diagnoseTime - + + + + + + + + + + + + + ID AS id, WOMAN_ID AS womanId, TYPE AS type, YUN_NUM AS + yunNum, CHAN_NUM + AS chanNum, SHUN_NUM AS shunNum, PAO_NUM AS paoNum, + LIU_NUM AS liuNum, + ZIRAN_NUM AS ziranNum, RENGONG_NUM AS rengongNum, + SITAI_NUM AS + sitaiNum, SICHAN_NUM AS sichanNum, CHILDDIE_NUM AS + childdieNum, + BIRTHDEFECT_NUM AS birthdefectNum, HEIGHT AS height, + WEIGHT AS weight, + WEIGHT_AGO AS weightAgo, WEIGHT_INDEX AS weightIndex, + BLOOD_SHRINK AS + bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, HEART AS + heart, LUNG AS + lung, WAIYIN_WOMAN AS waiyinWoman, YINDAO_WOMAN AS + yindaoWoman, + GONGJING_WOMAN AS gongjingWoman, ZIGONG_WOMAN AS + zigongWoman, + FUJIAN_WOMAN AS fujianWoman, GONGGAO_OBSTETRICS AS + gonggaoObstetrics, + FUWEI_OBSTETRICS AS fuweiObstetrics, + FUZHONG_OBSTETRICS AS + fuzhongObstetrics, TAISHU_OBSTETRICS AS + taishuObstetrics, + DISPOSE_SUGGEST AS disposeSuggest, GUIDE_SUGGEST AS + guideSuggest, + NEXTINSPECT_NUM AS nextinspectNum, NEXTINSPECT_TIME AS + nextinspectTime, DOCTOR_ID AS doctorId, ORG_ID AS orgId, DIAGNOSE_TIME + AS diagnoseTime,PERSON_ID AS personId, HAS_HIGHRISK AS hasHighrisk, + CUS_HR_COLORCODE AS + cusHrColorcode,CUS_HR_COLORTEXT AS cusHrColortext, + CUS_HR_NAME AS cusHrName,CUS_HR_GRADE AS + cusHrGrade,HAS_DIAGNOSE AS + hasDiagnose + + + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java index 501568e..4d19bc6 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/diagnose/DiagnoseInfo.java @@ -18,501 +18,597 @@ import com.baomidou.mybatisplus.annotations.TableName; @TableName("DIAGNOSE_INFO") public class DiagnoseInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID") - private String id; - /** - * - */ - @TableField(value = "WOMAN_ID") - private String womanId; - /** - * 诊断类型，0为初诊，1为复诊 - */ - @TableField(value = "TYPE") - private Integer type; - /** - * 孕次 - */ - @TableField(value = "YUN_NUM") - private Integer yunNum; - /** - * 产次 - */ - @TableField(value = "CHAN_NUM") - private Integer chanNum; - /** - * 顺产 - */ - @TableField(value = "SHUN_NUM") - private Integer shunNum; - /** - * 刨宫产 - */ - @TableField(value = "PAO_NUM") - private Integer paoNum; - /** - * 流产 - */ - @TableField(value = "LIU_NUM") - private Integer liuNum; - /** - * 自然 - */ - @TableField(value = "ZIRAN_NUM") - private Integer ziranNum; - /** - * 人工 - */ - @TableField(value = "RENGONG_NUM") - private Integer rengongNum; - /** - * 死胎 - */ - @TableField(value = "SITAI_NUM") - private Integer sitaiNum; - /** - * 死产 - */ - @TableField(value = "SICHAN_NUM") - private Integer sichanNum; - /** - * 新生儿死亡 - */ - @TableField(value = "CHILDDIE_NUM") - private Integer childdieNum; - /** - * 出生缺陷儿 - */ - @TableField(value = "BIRTHDEFECT_NUM") - private Integer birthdefectNum; - /** - * 身高 - */ - @TableField(value = "HEIGHT") - private Integer height; - /** - * 体重 - */ - @TableField(value = "WEIGHT") - private Integer weight; - /** - * 孕前体重 - */ - @TableField(value = "HEIGHT_AGO") - private Integer heightAgo; - /** - * 体重指数 - */ - @TableField(value = "WEIGHT_INDEX") - private Double weightIndex; - /** - * 血压_收缩压 - */ - @TableField(value = "BLOOD_SHRINK") - private Integer bloodShrink; - /** - * 血压_舒张压 - */ - @TableField(value = "BLOOD_DIASTOLE") - private Integer bloodDiastole; - /** - * 心脏 - */ - @TableField(value = "HEART") - private String heart; - /** - * 肺部 - */ - @TableField(value = "LUNG") - private String lung; - /** - * 外阴 - */ - @TableField(value = "WAIYIN_WOMAN") - private String waiyinWoman; - /** - * 阴道 - */ - @TableField(value = "YINDAO_WOMAN") - private String yindaoWoman; - /** - * - */ - @TableField(value = "GONGJING_WOMAN") - private String gongjingWoman; - /** - * 子宫 - */ - @TableField(value = "ZIGONG_WOMAN") - private String zigongWoman; - /** - * 附件 - */ - @TableField(value = "FUJIAN_WOMAN") - private String fujianWoman; - /** - * 宫高 - */ - @TableField(value = "GONGGAO_OBSTETRICS") - private Integer gonggaoObstetrics; - /** - * 腹围 - */ - @TableField(value = "FUWEI_OBSTETRICS") - private Integer fuweiObstetrics; - /** - * 浮肿 - */ - @TableField(value = "FUZHONG_OBSTETRICS") - private Integer fuzhongObstetrics; - /** - * 胎数 - */ - @TableField(value = "TAISHU_OBSTETRICS") - private Integer taishuObstetrics; - /** - * 处理意见 - */ - @TableField(value = "DISPOSE_SUGGEST") - private String disposeSuggest; - /** - * 指导意见 - */ - @TableField(value = "GUIDE_SUGGEST") - private String guideSuggest; - /** - * 下次产检孕周数 - */ - @TableField(value = "NEXTINSPECT_NUM") - private Integer nextinspectNum; - /** - * 下次检查日期 - */ - @TableField(value = "NEXTINSPECT_TIME") - private Date nextinspectTime; - /** - * - */ - @TableField(value = "DOCTOR_ID") - private String doctorId; - /** - * 医院id - */ - @TableField(value = "ORG_ID") - private String orgId; - /** - * 诊断时间 - */ - @TableField(value = "DIAGNOSE_TIME") - private Date diagnoseTime; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getWomanId() { - return womanId; - } - - public void setWomanId(String womanId) { - this.womanId = womanId; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getYunNum() { - return yunNum; - } - - public void setYunNum(Integer yunNum) { - this.yunNum = yunNum; - } - - public Integer getChanNum() { - return chanNum; - } - - public void setChanNum(Integer chanNum) { - this.chanNum = chanNum; - } - - public Integer getShunNum() { - return shunNum; - } - - public void setShunNum(Integer shunNum) { - this.shunNum = shunNum; - } - - public Integer getPaoNum() { - return paoNum; - } - - public void setPaoNum(Integer paoNum) { - this.paoNum = paoNum; - } - - public Integer getLiuNum() { - return liuNum; - } - - public void setLiuNum(Integer liuNum) { - this.liuNum = liuNum; - } - - public Integer getZiranNum() { - return ziranNum; - } - - public void setZiranNum(Integer ziranNum) { - this.ziranNum = ziranNum; - } - - public Integer getRengongNum() { - return rengongNum; - } - - public void setRengongNum(Integer rengongNum) { - this.rengongNum = rengongNum; - } - - public Integer getSitaiNum() { - return sitaiNum; - } - - public void setSitaiNum(Integer sitaiNum) { - this.sitaiNum = sitaiNum; - } - - public Integer getSichanNum() { - return sichanNum; - } - - public void setSichanNum(Integer sichanNum) { - this.sichanNum = sichanNum; - } + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "ID") + private String id; + /** + * + */ + @TableField(value = "WOMAN_ID") + private String womanId; + /** + * 诊断类型，0为初诊，1为复诊 + */ + @TableField(value = "TYPE") + private Integer type; + /** + * 孕次 + */ + @TableField(value = "YUN_NUM") + private Integer yunNum; + /** + * 产次 + */ + @TableField(value = "CHAN_NUM") + private Integer chanNum; + /** + * 顺产 + */ + @TableField(value = "SHUN_NUM") + private Integer shunNum; + /** + * 刨宫产 + */ + @TableField(value = "PAO_NUM") + private Integer paoNum; + /** + * 流产 + */ + @TableField(value = "LIU_NUM") + private Integer liuNum; + /** + * 自然 + */ + @TableField(value = "ZIRAN_NUM") + private Integer ziranNum; + /** + * 人工 + */ + @TableField(value = "RENGONG_NUM") + private Integer rengongNum; + /** + * 死胎 + */ + @TableField(value = "SITAI_NUM") + private Integer sitaiNum; + /** + * 死产 + */ + @TableField(value = "SICHAN_NUM") + private Integer sichanNum; + /** + * 新生儿死亡 + */ + @TableField(value = "CHILDDIE_NUM") + private Integer childdieNum; + /** + * 出生缺陷儿 + */ + @TableField(value = "BIRTHDEFECT_NUM") + private Integer birthdefectNum; + /** + * 身高 + */ + @TableField(value = "HEIGHT") + private Integer height; + /** + * 体重 + */ + @TableField(value = "WEIGHT") + private Integer weight; + /** + * 孕前体重 + */ + @TableField(value = "WEIGHT_AGO") + private Integer weightAgo; + /** + * 体重指数 + */ + @TableField(value = "WEIGHT_INDEX") + private Double weightIndex; + /** + * 血压_收缩压 + */ + @TableField(value = "BLOOD_SHRINK") + private Integer bloodShrink; + /** + * 血压_舒张压 + */ + @TableField(value = "BLOOD_DIASTOLE") + private Integer bloodDiastole; + /** + * 心脏 + */ + @TableField(value = "HEART") + private String heart; + /** + * 肺部 + */ + @TableField(value = "LUNG") + private String lung; + /** + * 外阴 + */ + @TableField(value = "WAIYIN_WOMAN") + private String waiyinWoman; + /** + * 阴道 + */ + @TableField(value = "YINDAO_WOMAN") + private String yindaoWoman; + /** + * + */ + @TableField(value = "GONGJING_WOMAN") + private String gongjingWoman; + /** + * 子宫 + */ + @TableField(value = "ZIGONG_WOMAN") + private String zigongWoman; + /** + * 附件 + */ + @TableField(value = "FUJIAN_WOMAN") + private String fujianWoman; + /** + * 宫高 + */ + @TableField(value = "GONGGAO_OBSTETRICS") + private Integer gonggaoObstetrics; + /** + * 腹围 + */ + @TableField(value = "FUWEI_OBSTETRICS") + private Integer fuweiObstetrics; + /** + * 浮肿 + */ + @TableField(value = "FUZHONG_OBSTETRICS") + private Integer fuzhongObstetrics; + /** + * 胎数 + */ + @TableField(value = "TAISHU_OBSTETRICS") + private Integer taishuObstetrics; + /** + * 处理意见 + */ + @TableField(value = "DISPOSE_SUGGEST") + private String disposeSuggest; + /** + * 指导意见 + */ + @TableField(value = "GUIDE_SUGGEST") + private String guideSuggest; + /** + * 下次产检孕周数 + */ + @TableField(value = "NEXTINSPECT_NUM") + private Integer nextinspectNum; + /** + * 下次检查日期 + */ + @TableField(value = "NEXTINSPECT_TIME") + private Date nextinspectTime; + /** + * + */ + @TableField(value = "DOCTOR_ID") + private String doctorId; + /** + * 医院id + */ + @TableField(value = "ORG_ID") + private String orgId; + /** + * 诊断时间 + */ + @TableField(value = "DIAGNOSE_TIME") + private Date diagnoseTime; + + //补充字段 by xujiahong since 2017-04-26====================================== + + /** + * 居民表ID + */ + @TableField(value = "PERSON_ID") + private String personId; + /** + * 是否存在高危定义，1有，0没有 + */ + @TableField(value = "HAS_HIGHRISK") + private Integer hasHighrisk; + /** + * 其他用户自定义高危颜色编码 + */ + @TableField(value = "CUS_HR_COLORCODE") + private String cusHrColorcode; + /** + * 其他用户自定义高危颜色描述 + */ + @TableField(value = "CUS_HR_COLORTEXT") + private String cusHrColortext; + /** + * 其他用户自定义高危描述 + */ + @TableField(value = "CUS_HR_NAME") + private String cusHrName; + /** + * 其他用户自定义高危评分 + */ + @TableField(value = "CUS_HR_GRADE") + private Integer cusHrGrade; + /** + * 是否存在诊断定义，1有，0没有 + */ + @TableField(value = "HAS_DIAGNOSE") + private Integer hasDiagnose; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWomanId() { + return womanId; + } + + public void setWomanId(String womanId) { + this.womanId = womanId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getYunNum() { + return yunNum; + } + + public void setYunNum(Integer yunNum) { + this.yunNum = yunNum; + } + + public Integer getChanNum() { + return chanNum; + } + + public void setChanNum(Integer chanNum) { + this.chanNum = chanNum; + } + + public Integer getShunNum() { + return shunNum; + } + + public void setShunNum(Integer shunNum) { + this.shunNum = shunNum; + } + + public Integer getPaoNum() { + return paoNum; + } + + public void setPaoNum(Integer paoNum) { + this.paoNum = paoNum; + } + + public Integer getLiuNum() { + return liuNum; + } + + public void setLiuNum(Integer liuNum) { + this.liuNum = liuNum; + } + + public Integer getZiranNum() { + return ziranNum; + } + + public void setZiranNum(Integer ziranNum) { + this.ziranNum = ziranNum; + } + + public Integer getRengongNum() { + return rengongNum; + } + + public void setRengongNum(Integer rengongNum) { + this.rengongNum = rengongNum; + } + + public Integer getSitaiNum() { + return sitaiNum; + } + + public void setSitaiNum(Integer sitaiNum) { + this.sitaiNum = sitaiNum; + } + + public Integer getSichanNum() { + return sichanNum; + } + + public void setSichanNum(Integer sichanNum) { + this.sichanNum = sichanNum; + } + + public Integer getChilddieNum() { + return childdieNum; + } - public Integer getChilddieNum() { - return childdieNum; - } + public void setChilddieNum(Integer childdieNum) { + this.childdieNum = childdieNum; + } - public void setChilddieNum(Integer childdieNum) { - this.childdieNum = childdieNum; - } + public Integer getBirthdefectNum() { + return birthdefectNum; + } - public Integer getBirthdefectNum() { - return birthdefectNum; - } + public void setBirthdefectNum(Integer birthdefectNum) { + this.birthdefectNum = birthdefectNum; + } - public void setBirthdefectNum(Integer birthdefectNum) { - this.birthdefectNum = birthdefectNum; - } + public Integer getHeight() { + return height; + } - public Integer getHeight() { - return height; - } + public void setHeight(Integer height) { + this.height = height; + } - public void setHeight(Integer height) { - this.height = height; - } + public Integer getWeight() { + return weight; + } - public Integer getWeight() { - return weight; - } + public void setWeight(Integer weight) { + this.weight = weight; + } + + public Integer getWeightAgo() { + return weightAgo; + } - public void setWeight(Integer weight) { - this.weight = weight; - } + public void setWeightAgo(Integer weightAgo) { + this.weightAgo = weightAgo; + } - public Integer getHeightAgo() { - return heightAgo; - } + public Double getWeightIndex() { + return weightIndex; + } - public void setHeightAgo(Integer heightAgo) { - this.heightAgo = heightAgo; - } + public void setWeightIndex(Double weightIndex) { + this.weightIndex = weightIndex; + } - public Double getWeightIndex() { - return weightIndex; - } + public Integer getBloodShrink() { + return bloodShrink; + } - public void setWeightIndex(Double weightIndex) { - this.weightIndex = weightIndex; - } + public void setBloodShrink(Integer bloodShrink) { + this.bloodShrink = bloodShrink; + } - public Integer getBloodShrink() { - return bloodShrink; - } + public Integer getBloodDiastole() { + return bloodDiastole; + } - public void setBloodShrink(Integer bloodShrink) { - this.bloodShrink = bloodShrink; - } + public void setBloodDiastole(Integer bloodDiastole) { + this.bloodDiastole = bloodDiastole; + } - public Integer getBloodDiastole() { - return bloodDiastole; - } + public String getHeart() { + return heart; + } - public void setBloodDiastole(Integer bloodDiastole) { - this.bloodDiastole = bloodDiastole; - } + public void setHeart(String heart) { + this.heart = heart; + } - public String getHeart() { - return heart; - } + public String getLung() { + return lung; + } - public void setHeart(String heart) { - this.heart = heart; - } + public void setLung(String lung) { + this.lung = lung; + } - public String getLung() { - return lung; - } + public String getWaiyinWoman() { + return waiyinWoman; + } - public void setLung(String lung) { - this.lung = lung; - } + public void setWaiyinWoman(String waiyinWoman) { + this.waiyinWoman = waiyinWoman; + } - public String getWaiyinWoman() { - return waiyinWoman; - } + public String getYindaoWoman() { + return yindaoWoman; + } - public void setWaiyinWoman(String waiyinWoman) { - this.waiyinWoman = waiyinWoman; - } + public void setYindaoWoman(String yindaoWoman) { + this.yindaoWoman = yindaoWoman; + } - public String getYindaoWoman() { - return yindaoWoman; - } + public String getGongjingWoman() { + return gongjingWoman; + } - public void setYindaoWoman(String yindaoWoman) { - this.yindaoWoman = yindaoWoman; - } + public void setGongjingWoman(String gongjingWoman) { + this.gongjingWoman = gongjingWoman; + } - public String getGongjingWoman() { - return gongjingWoman; - } + public String getZigongWoman() { + return zigongWoman; + } - public void setGongjingWoman(String gongjingWoman) { - this.gongjingWoman = gongjingWoman; - } + public void setZigongWoman(String zigongWoman) { + this.zigongWoman = zigongWoman; + } - public String getZigongWoman() { - return zigongWoman; - } + public String getFujianWoman() { + return fujianWoman; + } - public void setZigongWoman(String zigongWoman) { - this.zigongWoman = zigongWoman; - } + public void setFujianWoman(String fujianWoman) { + this.fujianWoman = fujianWoman; + } - public String getFujianWoman() { - return fujianWoman; - } + public Integer getGonggaoObstetrics() { + return gonggaoObstetrics; + } - public void setFujianWoman(String fujianWoman) { - this.fujianWoman = fujianWoman; - } + public void setGonggaoObstetrics(Integer gonggaoObstetrics) { + this.gonggaoObstetrics = gonggaoObstetrics; + } - public Integer getGonggaoObstetrics() { - return gonggaoObstetrics; - } + public Integer getFuweiObstetrics() { + return fuweiObstetrics; + } - public void setGonggaoObstetrics(Integer gonggaoObstetrics) { - this.gonggaoObstetrics = gonggaoObstetrics; - } + public void setFuweiObstetrics(Integer fuweiObstetrics) { + this.fuweiObstetrics = fuweiObstetrics; + } - public Integer getFuweiObstetrics() { - return fuweiObstetrics; - } + public Integer getFuzhongObstetrics() { + return fuzhongObstetrics; + } - public void setFuweiObstetrics(Integer fuweiObstetrics) { - this.fuweiObstetrics = fuweiObstetrics; - } + public void setFuzhongObstetrics(Integer fuzhongObstetrics) { + this.fuzhongObstetrics = fuzhongObstetrics; + } - public Integer getFuzhongObstetrics() { - return fuzhongObstetrics; - } + public Integer getTaishuObstetrics() { + return taishuObstetrics; + } - public void setFuzhongObstetrics(Integer fuzhongObstetrics) { - this.fuzhongObstetrics = fuzhongObstetrics; - } + public void setTaishuObstetrics(Integer taishuObstetrics) { + this.taishuObstetrics = taishuObstetrics; + } - public Integer getTaishuObstetrics() { - return taishuObstetrics; - } + public String getDisposeSuggest() { + return disposeSuggest; + } - public void setTaishuObstetrics(Integer taishuObstetrics) { - this.taishuObstetrics = taishuObstetrics; - } + public void setDisposeSuggest(String disposeSuggest) { + this.disposeSuggest = disposeSuggest; + } - public String getDisposeSuggest() { - return disposeSuggest; - } + public String getGuideSuggest() { + return guideSuggest; + } - public void setDisposeSuggest(String disposeSuggest) { - this.disposeSuggest = disposeSuggest; - } + public void setGuideSuggest(String guideSuggest) { + this.guideSuggest = guideSuggest; + } - public String getGuideSuggest() { - return guideSuggest; - } + public Integer getNextinspectNum() { + return nextinspectNum; + } - public void setGuideSuggest(String guideSuggest) { - this.guideSuggest = guideSuggest; - } + public void setNextinspectNum(Integer nextinspectNum) { + this.nextinspectNum = nextinspectNum; + } - public Integer getNextinspectNum() { - return nextinspectNum; - } + public Date getNextinspectTime() { + return nextinspectTime; + } - public void setNextinspectNum(Integer nextinspectNum) { - this.nextinspectNum = nextinspectNum; - } + public void setNextinspectTime(Date nextinspectTime) { + this.nextinspectTime = nextinspectTime; + } - public Date getNextinspectTime() { - return nextinspectTime; - } + public String getDoctorId() { + return doctorId; + } - public void setNextinspectTime(Date nextinspectTime) { - this.nextinspectTime = nextinspectTime; - } + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } - public String getDoctorId() { - return doctorId; - } + public String getOrgId() { + return orgId; + } - public void setDoctorId(String doctorId) { - this.doctorId = doctorId; - } + public void setOrgId(String orgId) { + this.orgId = orgId; + } - public String getOrgId() { - return orgId; - } + public Date getDiagnoseTime() { + return diagnoseTime; + } - public void setOrgId(String orgId) { - this.orgId = orgId; - } + public void setDiagnoseTime(Date diagnoseTime) { + this.diagnoseTime = diagnoseTime; + } - public Date getDiagnoseTime() { - return diagnoseTime; - } + public String getPersonId() { + return personId; + } - public void setDiagnoseTime(Date diagnoseTime) { - this.diagnoseTime = diagnoseTime; - } + public void setPersonId(String personId) { + this.personId = personId; + } + + public Integer getHasHighrisk() { + return hasHighrisk; + } + + public void setHasHighrisk(Integer hasHighrisk) { + this.hasHighrisk = hasHighrisk; + } + + public String getCusHrColorcode() { + return cusHrColorcode; + } + + public void setCusHrColorcode(String cusHrColorcode) { + this.cusHrColorcode = cusHrColorcode; + } + + public String getCusHrColortext() { + return cusHrColortext; + } + + public void setCusHrColortext(String cusHrColortext) { + this.cusHrColortext = cusHrColortext; + } + + public String getCusHrName() { + return cusHrName; + } + + public void setCusHrName(String cusHrName) { + this.cusHrName = cusHrName; + } + + public Integer getCusHrGrade() { + return cusHrGrade; + } + + public void setCusHrGrade(Integer cusHrGrade) { + this.cusHrGrade = cusHrGrade; + } + + public Integer getHasDiagnose() { + return hasDiagnose; + } + + public void setHasDiagnose(Integer hasDiagnose) { + this.hasDiagnose = hasDiagnose; + } + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java index 474acc9..359b85d 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java @@ -3,6 +3,8 @@ package com.lyms.hospital.entity.woman; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.lyms.util.DateUtil; + import java.io.Serializable; import java.util.Date; @@ -292,7 +294,24 @@ public class WomanFetationRecord implements Serializable { @TableField(value="SOURCE_ID") private String sourceId; - //格式化字段 + /** + * 分娩日期 + */ + @TableField(value="FM_DATE") + private Date fmDate; + /** + * 是否自动分娩，0不是，1是 + */ + @TableField(value="IFAUTOFM") + private Integer ifautofm; + + /** + * 孕妇状态，1孕妇，3产妇 + */ + @TableField(value="STATE") + private Integer state; + + //格式化字段（5各自段已格式化） @TableField(exist=false) private String baseWomanBirthStr;//孕妇生日Str @TableField(exist=false) @@ -697,6 +716,7 @@ public class WomanFetationRecord implements Serializable { public void setBaseWomanBirth(Date baseWomanBirth) { this.baseWomanBirth = baseWomanBirth; + this.baseWomanBirthStr = DateUtil.getyyyy_MM_dd(baseWomanBirth); } public Date getHospitalLastMenstruation() { return hospitalLastMenstruation; @@ -704,6 +724,7 @@ public class WomanFetationRecord implements Serializable { public void setHospitalLastMenstruation(Date hospitalLastMenstruation) { this.hospitalLastMenstruation = hospitalLastMenstruation; + this.hospitalLastMenstruationStr = DateUtil.getyyyy_MM_dd(hospitalLastMenstruation); } public Date getHospitalCorrectLastMenstruation() { @@ -712,6 +733,7 @@ public class WomanFetationRecord implements Serializable { public void setHospitalCorrectLastMenstruation(Date hospitalCorrectLastMenstruation) { this.hospitalCorrectLastMenstruation = hospitalCorrectLastMenstruation; + this.hospitalCorrectLastMenstruationStr = DateUtil.getyyyy_MM_dd(hospitalCorrectLastMenstruation); } public Date getHospitalExpectedDate() { @@ -720,12 +742,14 @@ public class WomanFetationRecord implements Serializable { public void setHospitalExpectedDate(Date hospitalExpectedDate) { this.hospitalExpectedDate = hospitalExpectedDate; + this.hospitalExpectedDateStr = DateUtil.getyyyy_MM_dd(hospitalExpectedDate); } public Date getHospitalRecordDate() { return hospitalRecordDate; } public void setHospitalRecordDate(Date hospitalRecordDate) { this.hospitalRecordDate = hospitalRecordDate; + this.hospitalRecordDateStr = DateUtil.getyyyy_MM_dd(hospitalRecordDate); } public String getBaseWomanBirthStr() { @@ -816,5 +840,37 @@ public class WomanFetationRecord implements Serializable { this.sourceId = sourceId; } + public Date getFmDate() { + return fmDate; + } + + public void setFmDate(Date fmDate) { + this.fmDate = fmDate; + } + + public String getPersonId() { + return personId; + } + + public void setPersonId(String personId) { + this.personId = personId; + } + + public Integer getIfautofm() { + return ifautofm; + } + + public void setIfautofm(Integer ifautofm) { + this.ifautofm = ifautofm; + } + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java index 0a3be46..828be87 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java @@ -1,12 +1,21 @@ package com.lyms.hospital.service.diagnose; +import java.io.Serializable; +import java.util.List; + +import com.lyms.hospital.entity.assist.DiagnoseAssit; +import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; +import com.lyms.hospital.entity.history.HistoryMaps; import com.lyms.web.service.BaseService; -import java.io.Serializable; +import java.util.List; /** *

* 服务类 + * + * 保存初诊数据 + * 保存复诊数据 *

* * @author jiangjiazhi @@ -20,5 +29,26 @@ public interface DiagnoseInfoService extends BaseService { *
  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:保存初诊数据 + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月26日 + *
  • 修改人： + *
  • 修改时间： + */ + public String saveFirstExam(DiagnoseInfo info,DiagnoseAssit assist,List historyList); + /** + *
  • @Description:根据居民ID获取末次高危 + *
  • @param personId 居民ID + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年4月25日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getLastHighrisk(Serializable personId); + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java index 11ceb01..02c21ce 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java @@ -10,96 +10,140 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.entity.conf.HighriskConf; import com.lyms.hospital.dao.diagnose.DiagnoseInfoMapper; import com.lyms.hospital.entity.assist.DiagnoseAssit; import com.lyms.hospital.entity.diagnose.DiagnoseInfo; +import com.lyms.hospital.entity.history.HistoryMaps; import com.lyms.hospital.service.assist.DiagnoseAssitService; import com.lyms.hospital.service.diagnose.DiagnoseInfoService; import com.lyms.util.StrUtils; /** *

    - * 诊断信息表，包含初诊、复诊信息 服务实现类 + * 诊断信息表，包含初诊、复诊信息 服务实现类 *

    * * @author jiangjiazhi - * @link DiagnoseTypeEnums 初诊 复诊 分类接口 + * @link DiagnoseTypeEnums 初诊 复诊 分类接口 * @since 2017-03-28 */ @Service -public class DiagnoseInfoServiceImpl extends ServiceImpl implements - DiagnoseInfoService { +public class DiagnoseInfoServiceImpl extends ServiceImpl + implements DiagnoseInfoService { - @Autowired - private DiagnoseAssitService diagnoseAssitService; + @Autowired + private DiagnoseAssitService diagnoseAssitService; - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } - @Transactional - public void addOrUpdate(DiagnoseInfo dInfo, DiagnoseAssit diagnoseAssit) { - if (StringUtils.isEmpty(dInfo.getId())) { - dInfo.setId(StrUtils.uuid()); - insert(dInfo); - if (StringUtils.isEmpty(diagnoseAssit.getId())) { - diagnoseAssit.setId(StrUtils.uuid()); - } - diagnoseAssit.setDiagnoseId(dInfo.getId()); - diagnoseAssitService.insert(diagnoseAssit); - } else { - updateById(dInfo); - diagnoseAssitService.updateById(diagnoseAssit); - } - } + @Transactional + public void addOrUpdate(DiagnoseInfo dInfo, DiagnoseAssit diagnoseAssit) { + if (StringUtils.isEmpty(dInfo.getId())) { + dInfo.setId(StrUtils.uuid()); + insert(dInfo); + if (StringUtils.isEmpty(diagnoseAssit.getId())) { + diagnoseAssit.setId(StrUtils.uuid()); + } + diagnoseAssit.setDiagnoseId(dInfo.getId()); + diagnoseAssitService.insert(diagnoseAssit); + } else { + updateById(dInfo); + diagnoseAssitService.updateById(diagnoseAssit); + } + } - /** - * 根据建档记录id查询所有有效的产检记录 - * - *
  • @param parentId 建档id - *
  • @return - *
  • 创建人：Administrator - *
  • 创建时间：2017-3-31 - *
  • 修改人： - *
  • 修改时间： - */ - public List findListByParentId(String parentId) { - EntityWrapper ew = new EntityWrapper(); - ew.where("WOMAN_ID={0}", parentId); - return selectList(ew); - } + /** + * 根据建档记录id查询所有有效的产检记录 + * + *
  • @param parentId 建档id + *
  • @return + *
  • 创建人：Administrator + *
  • 创建时间：2017-3-31 + *
  • 修改人： + *
  • 修改时间： + */ + public List findListByParentId(String parentId) { + EntityWrapper ew = new EntityWrapper(); + ew.where("WOMAN_ID={0}", parentId); + return selectList(ew); + } - /** - * - * 根据条件查询产检信息 - * - *
  • @param type - *
  • @param cardNum - *
  • @return - *
  • 创建人：Administrator - *
  • 创建时间：2017-3-31 - *
  • 修改人： - *
  • 修改时间： - */ - public DiagnoseInfo findByCond(int type, String cardNum) { - EntityWrapper ew = new EntityWrapper(); - ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE); - return (DiagnoseInfo) selectObj(ew); - } + /** + * + * 根据条件查询产检信息 + * + *
  • @param type + *
  • @param cardNum + *
  • @return + *
  • 创建人：Administrator + *
  • 创建时间：2017-3-31 + *
  • 修改人： + *
  • 修改时间： + */ + public DiagnoseInfo findByCond(int type, String cardNum) { + EntityWrapper ew = new EntityWrapper(); + ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE); + return (DiagnoseInfo) selectObj(ew); + } + + /** + * 查询这个人所有的产检记录 + * + *
  • @param pid + *
  • @return + *
  • 创建人：Administrator + *
  • 创建时间：2017-3-31 + *
  • 修改人： + *
  • 修改时间： + */ + public List findListByPid(String pid) { + EntityWrapper ew = new EntityWrapper(); + ew.where("pid={0}", pid); + return selectList(ew); + } + + @Override + @Transactional + public String saveFirstExam(DiagnoseInfo info, DiagnoseAssit assist, List historyList) { + /* + * 基础验证 + */ + if (info == null || assist == null || historyList == null) { + return "参数缺失"; + } + + /* + * （1）保存产检基本信息 （2）批量保存病史信息 （3）保存辅助检查信息 + */ +// if (StringUtils.isEmpty(info.getId())) {//新增 +// info.setId(StrUtils.uuid()); +// insert(info); +// if (StringUtils.isEmpty(assist.getId())) { +// assist.setId(StrUtils.uuid()); +// } +// diagnoseAssit.setDiagnoseId(dInfo.getId()); +// diagnoseAssitService.insert(diagnoseAssit); +// } else {//修改 +// updateById(dInfo); +// diagnoseAssitService.updateById(diagnoseAssit); +// } + return null; + + /* + "familyHistory":"yes" + familyHistory xyb true; + + + + */ + + } - /** - * 查询这个人所有的产检记录 - * - *
  • @param pid - *
  • @return - *
  • 创建人：Administrator - *
  • 创建时间：2017-3-31 - *
  • 修改人： - *
  • 修改时间： - */ - public List findListByPid(String pid) { - EntityWrapper ew = new EntityWrapper(); - ew.where("pid={0}", pid); - return selectList(ew); + @Override + public List getLastHighrisk(Serializable personId) { + return baseMapper.getLastHighrisk(personId); } } \ No newline at end of file diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java index 7a89889..f512364 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java @@ -1,21 +1,33 @@ package com.lyms.hospital.controller.woman; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.lyms.hospital.entity.woman.WomanFetationRecord; +import com.lyms.hospital.request.exam.ExamAddRequest; +import com.lyms.hospital.service.diagnose.DiagnoseInfoService; import com.lyms.hospital.service.woman.WomanFetationRecordService; +import com.lyms.hospital.util.HospitalUtil; +import com.lyms.util.DateUtil; import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; /** * 孕妇产检 前端控制器
    * - * 依据cardNo或vcCardNo查询孕妇产检记录 + * [--]依据cardNo或vcCardNo查询孕妇产检记录 + * 保存初诊数据 * * @author xujiahong * @@ -26,6 +38,29 @@ public class WomanExamController extends BaseController { @Autowired private WomanFetationRecordService fetationService; + @Autowired + private DiagnoseInfoService infoService; + + /** + *
  • @Description:保存初诊数据 + *
  • @param request + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月26日 + *
  • 修改人： + *
  • 修改时间： + */ + @RequestMapping(value = "/antex", method = RequestMethod.POST) + @ResponseBody + public AjaxResult saveExam(@RequestBody ExamAddRequest request){ + /* + * （1）保存产检基本信息 + * 多个胎儿信息 + * （2）批量保存病史信息 + * （3）保存辅助检查信息 + */ + return AjaxResult.returnFail(); + } /** *
  • @Description:依据cardNo或vcCardNo查询孕妇产检记录 @@ -37,13 +72,14 @@ public class WomanExamController extends BaseController { *
  • 修改人： *
  • 修改时间： */ - @RequestMapping(value = "/antexmanage", method = RequestMethod.POST) + @RequestMapping(value = "/antexmanage", method = RequestMethod.GET) @ResponseBody - public AjaxResult deletePregnant(String cardNo,String vcCardNo,String orgId){//orgId或来自token + public AjaxResult selectExamHistory(String cardNo,String vcCardNo,String orgId){//orgId或来自token /* - * （1）孕妇档案信息（通过证件号或就诊卡号查询） + * （1）孕妇档案信息（通过证件号或就诊卡号查询）-根据产检券查询 TODO * （2）高危因素列表 TODO - * （3）产检记录列表 + * （3）产检记录列表 TODO + * */ //基本验证 if(StringUtils.isEmpty(orgId)){ @@ -73,11 +109,35 @@ public class WomanExamController extends BaseController { return AjaxResult.returnFail("未查询到孕妇建档信息"); } //（2）高危因素列表 TODO - //（3）产检记录列表 TODO （此处需要查询当前产程中本院和外院的所有产检记录） - - + List> riskFactor = new ArrayList<>(); + //（3）产检记录列表 TODO （此处需要查询当前产程中本院和外院的所有产检记录（包括分布建档的），之后对接方承） + List> data = new ArrayList<>(); //data 系前端指定名称 + //（4）组装返回对象 + Map dataMap = new HashMap<>(); + dataMap.put("id", dbFetationRecord.getId()); + dataMap.put("pid", dbFetationRecord.getWomanPersonId()); + dataMap.put("name", dbFetationRecord.getBaseWomanName()); + dataMap.put("age", DateUtil.getAge(dbFetationRecord.getBaseWomanBirth())); + //根据“纠正末次月经”计算孕周 + dataMap.put("dueWeek", HospitalUtil.getPregnantWeek(dbFetationRecord.getHospitalCorrectLastMenstruation())); + dataMap.put("yChanQi", dbFetationRecord.getHospitalExpectedDateStr()); + dataMap.put("phone", dbFetationRecord.getContactWomanWay()); + dataMap.put("riskScore", "15");// TODO 高危评分 + dataMap.put("remarks", dbFetationRecord.getHospitalRecordRemark()); + dataMap.put("lastMenses", dbFetationRecord.getHospitalLastMenstruationStr()); + dataMap.put("buildTime", dbFetationRecord.getHospitalRecordDateStr());//建档日期 + dataMap.put("lastBuildTime", dbFetationRecord.getHospitalRecordDateStr());// TODO ? + dataMap.put("birth", dbFetationRecord.getBaseWomanBirthStr()); + dataMap.put("tireNumber1", "1");// TODO ? + dataMap.put("cardNo", dbFetationRecord.getBasePapersNumber()); + dataMap.put("vcCardNo", dbFetationRecord.getHospitalPatientCard()); + dataMap.put("isSieve", "0");//TODO? + dataMap.put("isH", "0");// TODO? - return AjaxResult.returnFail(); + dataMap.put("riskFactor", riskFactor); + dataMap.put("data", data); + dataMap.put("now", DateUtil.getyyyy_MM_dd_hms(new Date())); + return AjaxResult.returnSuccess(dataMap); } } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java new file mode 100644 index 0000000..204f3f1 --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java @@ -0,0 +1,881 @@ +package com.lyms.hospital.request.exam; + +import java.util.List; +import java.util.Map; + +import org.hibernate.validator.constraints.NotEmpty; + +import com.lyms.hospital.util.Form; +import com.lyms.hospital.util.FormParam; + +/** + * + * 产前检查初诊 + * + * Created by Administrator on 2016/6/20 0020. + * import from ancient project by xujiahong on 2017-04-26 10:54:35 + */ +@Form +public class ExamAddRequest{ + @FormParam + @NotEmpty(message = "孕妇id不能为空") + private String parentId; + + private String barCode; + + private String id; + + private String pid; + //预产期 + private String dueDate; + //末次月经 + private String lastMenses; + + // 既往史 + private Map pastHistory ; + // 家族史 + private Map familyHistory ; + //个人史 + private Map personalHistory; + //疫苗接种史 + private Map ymjzHistory ; + //药物过敏史 + private Map ywgmHistory ; + //妇科手术史 + private Map fksxHistory ; + // 叶酸服用 + private Map ysfyHistory ; + //本次妊娠情况 + private Map cestationInfo; + //丈夫健康情况 + private Map hHealthInfo; + + //孕次 + private Integer pregnancyTimes; + // 产次 + private Integer prodTime; + // 顺产 + private Integer delivery; + //刨宫产 + private Integer planedProd; + //流产 + private Integer abortion; + //死胎 + private Integer stillbirth; + //死产 + private Integer stillChan ; + //新生儿死亡 + private Integer neoDeath; + //出生缺陷 + private Integer birthDefect; + // 身高 + private String height; + //体重 + private String weight ; + //孕前体重 + private String yqWeight ; + //体重指数 + private String baricIndex; + //心脏 + private String heart; + //肺部 + private String lungs; + //外阴 + private String vulva; + //阴道 + private String vagina; + // 宫颈 + private String cervical; + //子宫 + private String uterus; + //附件 + private String fujian; + // 宫高 + private String gonggao; + //腹围 + private String fuwei; + //胎数 + private String tireNumber1; + //血压 + private Map bp; + + + private String bg; + + private List placentas; +// //心率 +// private double heartRate; +// //胎方位 +// private String fetalPosition; +// //胎先露 +// private String fetalPresentation; +// // 衔接 +// private String join; + //高危因素 + private List highrisk ; + //高危评分 + private String highriskSocre; + // 其他高危 + private Map otherHighRisk; + // 诊断 + private List diagnosis; + //处理意见 + private String treatOpinion; + //指导意见 + private String guide; + //产检 医生 + @NotEmpty(message = "产检医生不能为空") + private String prodDoctor; + //产检日期 + private String checkTime; + //下次产检时间 + private String nextCheckTime; + //前端计算出来的孕周 + private String cDueWeek; + + /**辅助检查结果录入 **/ + //血红蛋白值 + private String xhdb; + //白细胞计数值 + private String bxbjs ; + // 血小板 + private String platelet ; + //血常规其他 + private String chgOther; + //尿蛋白 + private String ndb; + //尿糖 + private String nt; + //尿同体 + private String urineKetone; + //尿潜血 + private String bld ; + //尿常规其他 + private String ncgOther; + private String abo; + private String rh; + // 血糖 + private String bloodSugar; + // B超 + private String bChao ; + // 胎数 + private String tireNumber ; + //血清谷丙转氨酶 + private String xqgbzam ; + //血清谷草转氨酶 + private String xqgczam ; + //白蛋白 + private String albumin ; + //总胆红素 + private String totalBilirubin; + //结合胆红素 + private String jhBilirubin ; + // 乙肝表面抗原 + private String ygbmky ; + //乙肝表面抗体 + private String ygbmkt ; + //乙肝e抗原 + private String ygeky ; + // 乙肝e抗体 + private String ygekt ; + // 乙肝核心抗体 + private String yghxkt ; + //血清肌 + private String xqjq ; + //血尿素氮 + private String xnsd ; + //梅毒血清实验 + private String mdxqsy; + //hit抗体检测 + private String hivkt; + //阴道分泌物 + private Map ydfmw; + //阴道清洁度 + private String ydqjd; + //实验结果 + private String syjg; + + //自然流产 + private Integer abortionZR; + //人工流产 + private Integer abortionRG; + + public String getBarCode() { + return barCode; + } + + public void setBarCode(String barCode) { + this.barCode = barCode; + } + + public Integer getAbortionZR() { + return abortionZR; + } + + public void setAbortionZR(Integer abortionZR) { + this.abortionZR = abortionZR; + } + + public Integer getAbortionRG() { + return abortionRG; + } + + public void setAbortionRG(Integer abortionRG) { + this.abortionRG = abortionRG; + } + + public String getBg() { + return bg; + } + + public void setBg(String bg) { + this.bg = bg; + } + + public Map getBp() { + return bp; + } + + public void setBp(Map bp) { + this.bp = bp; + } + + public String getAbo() { + return abo; + } + + public void setAbo(String abo) { + this.abo = abo; + } + + public String getAlbumin() { + return albumin; + } + + public void setAlbumin(String albumin) { + this.albumin = albumin; + } + + public String getbChao() { + return bChao; + } + + public void setbChao(String bChao) { + this.bChao = bChao; + } + + public String getBld() { + return bld; + } + + public void setBld(String bld) { + this.bld = bld; + } + + public String getBloodSugar() { + return bloodSugar; + } + + public void setBloodSugar(String bloodSugar) { + this.bloodSugar = bloodSugar; + } + + public String getBxbjs() { + return bxbjs; + } + + public void setBxbjs(String bxbjs) { + this.bxbjs = bxbjs; + } + + public String getChgOther() { + return chgOther; + } + + public void setChgOther(String chgOther) { + this.chgOther = chgOther; + } + + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + + public Map gethHealthInfo() { + return hHealthInfo; + } + + public void sethHealthInfo(Map hHealthInfo) { + this.hHealthInfo = hHealthInfo; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public String getHivkt() { + return hivkt; + } + + public void setHivkt(String hivkt) { + this.hivkt = hivkt; + } + + public String getJhBilirubin() { + return jhBilirubin; + } + + public void setJhBilirubin(String jhBilirubin) { + this.jhBilirubin = jhBilirubin; + } + + public String getLastMenses() { + return lastMenses; + } + + public void setLastMenses(String lastMenses) { + this.lastMenses = lastMenses; + } + + public String getMdxqsy() { + return mdxqsy; + } + + public void setMdxqsy(String mdxqsy) { + this.mdxqsy = mdxqsy; + } + + public String getNcgOther() { + return ncgOther; + } + + public void setNcgOther(String ncgOther) { + this.ncgOther = ncgOther; + } + + public String getNdb() { + return ndb; + } + + public void setNdb(String ndb) { + this.ndb = ndb; + } + + public String getNt() { + return nt; + } + + public void setNt(String nt) { + this.nt = nt; + } + + public String getPlatelet() { + return platelet; + } + + public void setPlatelet(String platelet) { + this.platelet = platelet; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public String getSyjg() { + return syjg; + } + + public void setSyjg(String syjg) { + this.syjg = syjg; + } + + public String getTireNumber() { + return tireNumber; + } + + public void setTireNumber(String tireNumber) { + this.tireNumber = tireNumber; + } + + public String getTotalBilirubin() { + return totalBilirubin; + } + + public void setTotalBilirubin(String totalBilirubin) { + this.totalBilirubin = totalBilirubin; + } + + public String getUrineKetone() { + return urineKetone; + } + + public void setUrineKetone(String urineKetone) { + this.urineKetone = urineKetone; + } + + public String getXhdb() { + return xhdb; + } + + public void setXhdb(String xhdb) { + this.xhdb = xhdb; + } + + public String getXnsd() { + return xnsd; + } + + public void setXnsd(String xnsd) { + this.xnsd = xnsd; + } + + public String getXqgbzam() { + return xqgbzam; + } + + public void setXqgbzam(String xqgbzam) { + this.xqgbzam = xqgbzam; + } + + public String getXqgczam() { + return xqgczam; + } + + public void setXqgczam(String xqgczam) { + this.xqgczam = xqgczam; + } + + public String getXqjq() { + return xqjq; + } + + public void setXqjq(String xqjq) { + this.xqjq = xqjq; + } + + public Map getYdfmw() { + return ydfmw; + } + + public void setYdfmw(Map ydfmw) { + this.ydfmw = ydfmw; + } + + public String getYdqjd() { + return ydqjd; + } + + public void setYdqjd(String ydqjd) { + this.ydqjd = ydqjd; + } + + public String getYgbmkt() { + return ygbmkt; + } + + public void setYgbmkt(String ygbmkt) { + this.ygbmkt = ygbmkt; + } + + public String getYgbmky() { + return ygbmky; + } + + public void setYgbmky(String ygbmky) { + this.ygbmky = ygbmky; + } + + public String getYgekt() { + return ygekt; + } + + public void setYgekt(String ygekt) { + this.ygekt = ygekt; + } + + public String getYgeky() { + return ygeky; + } + + public void setYgeky(String ygeky) { + this.ygeky = ygeky; + } + + public String getYghxkt() { + return yghxkt; + } + + public void setYghxkt(String yghxkt) { + this.yghxkt = yghxkt; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getAbortion() { + return abortion; + } + + public String getBaricIndex() { + return baricIndex; + } + + public void setBaricIndex(String baricIndex) { + this.baricIndex = baricIndex; + } + + public void setAbortion(Integer abortion) { + this.abortion = abortion; + } + + public Integer getBirthDefect() { + return birthDefect; + } + + public void setBirthDefect(Integer birthDefect) { + this.birthDefect = birthDefect; + } + + public Integer getDelivery() { + return delivery; + } + + public void setDelivery(Integer delivery) { + this.delivery = delivery; + } + + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getPlanedProd() { + return planedProd; + } + + public void setPlanedProd(Integer planedProd) { + this.planedProd = planedProd; + } + + public Integer getPregnancyTimes() { + return pregnancyTimes; + } + + public void setPregnancyTimes(Integer pregnancyTimes) { + this.pregnancyTimes = pregnancyTimes; + } + + public Integer getProdTime() { + return prodTime; + } + + public void setProdTime(Integer prodTime) { + this.prodTime = prodTime; + } + + public Integer getStillbirth() { + return stillbirth; + } + + public void setStillbirth(Integer stillbirth) { + this.stillbirth = stillbirth; + } + + public Integer getStillChan() { + return stillChan; + } + + public void setStillChan(Integer stillChan) { + this.stillChan = stillChan; + } + + public Map getCestationInfo() { + return cestationInfo; + } + + public void setCestationInfo(Map cestationInfo) { + this.cestationInfo = cestationInfo; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + + public String getCervical() { + return cervical; + } + + public void setCervical(String cervical) { + this.cervical = cervical; + } + + public List getDiagnosis() { + return diagnosis; + } + + public void setDiagnosis(List diagnosis) { + this.diagnosis = diagnosis; + } + + public String getFujian() { + return fujian; + } + + public void setFujian(String fujian) { + this.fujian = fujian; + } + + public String getHeart() { + return heart; + } + + public void setHeart(String heart) { + this.heart = heart; + } + + public String getLungs() { + return lungs; + } + + public void setLungs(String lungs) { + this.lungs = lungs; + } + + public String getUterus() { + return uterus; + } + + public void setUterus(String uterus) { + this.uterus = uterus; + } + + public String getVagina() { + return vagina; + } + + public void setVagina(String vagina) { + this.vagina = vagina; + } + + public String getVulva() { + return vulva; + } + + public void setVulva(String vulva) { + this.vulva = vulva; + } + + public String getGuide() { + return guide; + } + + public void setGuide(String guide) { + this.guide = guide; + } + + public String getFuwei() { + return fuwei; + } + + public void setFuwei(String fuwei) { + this.fuwei = fuwei; + } + + public String getGonggao() { + return gonggao; + } + + public void setGonggao(String gonggao) { + this.gonggao = gonggao; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public List getHighrisk() { + return highrisk; + } + + public void setHighrisk(List highrisk) { + this.highrisk = highrisk; + } + + public String getHighriskSocre() { + return highriskSocre; + } + + public void setHighriskSocre(String highriskSocre) { + this.highriskSocre = highriskSocre; + } + + public String getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(String nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + + public Map getOtherHighRisk() { + return otherHighRisk; + } + + public void setOtherHighRisk(Map otherHighRisk) { + this.otherHighRisk = otherHighRisk; + } + + public List getPlacentas() { + return placentas; + } + + public void setPlacentas(List placentas) { + this.placentas = placentas; + } + + + + public String getProdDoctor() { + return prodDoctor; + } + + public void setProdDoctor(String prodDoctor) { + this.prodDoctor = prodDoctor; + } + + + + public String getTireNumber1() { + return tireNumber1; + } + + public void setTireNumber1(String tireNumber1) { + this.tireNumber1 = tireNumber1; + } + + public String getTreatOpinion() { + return treatOpinion; + } + + public void setTreatOpinion(String treatOpinion) { + this.treatOpinion = treatOpinion; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + + public Map getFksxHistory() { + return fksxHistory; + } + + public void setFksxHistory(Map fksxHistory) { + this.fksxHistory = fksxHistory; + } + + public Map getPastHistory() { + return pastHistory; + } + + public void setPastHistory(Map pastHistory) { + this.pastHistory = pastHistory; + } + + public Map getPersonalHistory() { + return personalHistory; + } + + public void setPersonalHistory(Map personalHistory) { + this.personalHistory = personalHistory; + } + + public Map getYmjzHistory() { + return ymjzHistory; + } + + public void setYmjzHistory(Map ymjzHistory) { + this.ymjzHistory = ymjzHistory; + } + + public String getYqWeight() { + return yqWeight; + } + + public void setYqWeight(String yqWeight) { + this.yqWeight = yqWeight; + } + + public Map getYsfyHistory() { + return ysfyHistory; + } + + public void setYsfyHistory(Map ysfyHistory) { + this.ysfyHistory = ysfyHistory; + } + + public Map getYwgmHistory() { + return ywgmHistory; + } + + public void setYwgmHistory(Map ywgmHistory) { + this.ywgmHistory = ywgmHistory; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/DiagnoseAssistKeymap.java b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/DiagnoseAssistKeymap.java new file mode 100644 index 0000000..09f7635 --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/DiagnoseAssistKeymap.java @@ -0,0 +1,165 @@ +package com.lyms.hospital.response.keymap; + +/** + * 辅助检查-新老系统字段名映射 + * @author xujiahong + * + */ +public class DiagnoseAssistKeymap { + + /* + 【未映射字段（需要手动get，set）】 + DIAGNOSE_ASSIT======================= + + ExamAddRequest======================= + + */ + + public static String[] original = { + + /* + * 辅助检查（DIAGNOSE_ASSIT） + */ +// //其他字段 +// "id",// +// "diagnoseId",// +// "diagnoseType",// +// "gonorrhoea",//淋病 +// "imageXt",//胸透描述 +// "childBonez",//骨密度Z值（儿保） +// "childKgj",//髋关节检查（儿保） + + //血常规（4） + "bloodroutineXhdb",// + "bloodroutineBxbjs",// + "bloodroutineXxbjs",// + "bloodroutineOther",// + + //尿常规（5） + "pissNdb",// + "pissNt",// + "pissNtt",// + "pissNqx",// + "pissOther",// + + //血型（3） + "bloodtype",// + "bloodtypeRh",// + "bloodtypeXt",// + + //肝功能（6） + "liverXqgbzam",// + "liverXqgczam",// + "liverBdb",// + "liverZdhs",// + "liverZhdhs",// + "liverBg",//【新字段】丙肝 + + //乙肝五项 5 + "hepatitisbYgbmky",// + "hepatitisbYgbmkt",// + "hepatitisbYgeky",// + "hepatitisbYgekt",// + "hepatitisbYghxkt",// + + //肾功能 2 + "kidneyXqjg",// + "kidneyXnsd",// + + //梅毒血清实验 2 + "syphilisSyjg",// + "syphilisHiv",// + + //阴道分泌物 5 +// "vaginaDc",// +// "vaginaJsjmj",// +// "vaginaOther",// +// "vaginaOtherTxt",// + "vaginaYdqjd",// + + //影像检查 1 + "imageBultrasound",// + + }; + + public static String[] alias = { + + /* + * 辅助检查（DIAGNOSE_ASSIT） + */ + //其他字段 + + //血常规 4 + "xhdb",// + "bxbjs",// + "platelet",// + "chgOther",// + + //尿常规 5 + "ndb",// + "nt",// + "urineKetone",// + "bld",// + "ncgOther",// + + //血型 3 + "abo",// + "rh",// + "bloodSugar",// + + //肝功能 6 + "xqgbzam",// + "xqgczam",// + "albumin",// + "totalBilirubin",// + "jhBilirubin",// + "liverBg",//【新字段】丙肝 + + //乙肝五项 5 + "ygbmky",// + "ygbmkt",// + "ygeky",// + "ygekt",// + "yghxkt",// + + //肾功能 2 + "xqjq",// + "xnsd",// + + //梅毒血清实验 2 + "mdxqsy",// + "hivkt",// + + //阴道分泌物 5 +// "ydfmw",//Map 字段 + "ydqjd",//阴道清洁度 + + //影像检查 1 + "bChao",// + + +// "barCode",// +// "bg",// +// "bp",// +// "cestationInfo",// +// "diagnosis",// +// "dueDate",// +// "familyHistory",// +// "fksxHistory",// +// "hHealthInfo",// +// "id",// +// "lastMenses",// +// "otherHighRisk",// +// "parentId",// +// "pastHistory",// +// "personalHistory",// +// "pid",// +// "placentas",// +// "syjg",// +// "tireNumber",// +// "ymjzHistory",// +// "ysfyHistory",// +// "ywgmHistory",// + }; + +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java new file mode 100644 index 0000000..d00b0a7 --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java @@ -0,0 +1,149 @@ +package com.lyms.hospital.response.keymap; + +/** + * 孕妇产检-新老系统字段名映射 + * @author xujiahong + * + */ +public class WomanExamKeymap { + + /* + * + 【未映射字段（需要手动get，set）】 + DIAGNOSE_INFO======================= + "id",//产检记录ID + "personId",//居民表ID + "womanId",//孕妇档案ID + + "orgId",//医院ID + "type",//诊断类型，0为初诊，1为复诊 + 【未知字段】 + "fuzhongObstetrics",//浮肿 + + + + ExamAddRequest======================= + + */ + + + + public static String[] original = { + + /* + * 诊断基础信息（DIAGNOSE_INFO） + */ + + //基础信息字段（4） + "doctorId",//医生ID + "diagnoseTime",//产检时间 + "nextinspectTime",//下次检查日期 + "nextinspectNum",//下次产检孕周数 + + //孕产史（11） + "yunNum",// + "chanNum",// + "shunNum",// + "paoNum",// + "liuNum",// + "ziranNum",//自然 + "rengongNum",//人工 + "sitaiNum",// + "sichanNum",// + "childdieNum",// + "birthdefectNum",// + + //一般检查（8） + "height",// + "weight",// + "weightAgo",//孕前体重 + "weightIndex",// + "bloodShrink",//【新字段】血压_收缩压 + "bloodDiastole",//【新字段】血压_舒张压 + "heart",// + "lung",// + + //妇科检查（5） + "waiyinWoman",// + "yindaoWoman",// + "gongjingWoman",// + "zigongWoman",// + "fujianWoman",// + + //产科检查（3） + "gonggaoObstetrics",// + "fuweiObstetrics",// +// "fuzhongObstetrics",//浮肿 + "taishuObstetrics",// + + //高危评分（5） +// "hasHighrisk",// +// "cusHrColorcode",// +// "cusHrColortext",// +// "cusHrName",// +// "cusHrGrade",// + + //诊断指导（2） +// "hasDiagnose",// + "disposeSuggest",// + "guideSuggest",// + + + }; + + public static String[] alias = { + + //基础信息字段（4） + "prodDoctor",// + "checkTime",// + "nextCheckTime",// + "cDueWeek",// + + //孕产史（11） + "pregnancyTimes",//孕次 + "prodTime",//产次 + "delivery",//顺产 + "planedProd",//刨宫产 + "abortion",//流产 + "abortionZR",// + "abortionRG",// + "stillbirth",//死胎 + "stillChan",//死产 + "neoDeath",//新生儿死亡 + "birthDefect",//出生缺陷儿 + + //一般检查（8） + "height",// + "weight",// + "yqWeight",// + "baricIndex",// + //之前是map装起来的 + "bloodShrink",//【新字段】血压_收缩压 + "bloodDiastole",//【新字段】血压_舒张压 + "heart",// + "lungs",// + + //妇科检查（5）外阴，阴道，宫颈，子宫，附件 + "vulva",// + "vagina",// + "cervical",// + "uterus",// + "fujian",// + + //产科检查（3）宫高，腹围，胎数 + "gonggao",// + "fuwei",// + "tireNumber1",// + + //高危评分（5） +// "highriskSocre",//高危评分 + + + //诊断指导（2） + "treatOpinion",//处理意见 + "guide",//指导意见 + + + }; + +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java b/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java index 4149ca1..c290b26 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/util/trans/XjhMapUtil.java @@ -11,7 +11,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.lyms.hospital.response.keymap.WomanFetationRecordKeymap; +import com.lyms.hospital.entity.assist.DiagnoseAssit; +import com.lyms.hospital.request.exam.ExamAddRequest; import com.lyms.util.DateUtil; public class XjhMapUtil { @@ -284,8 +285,8 @@ public class XjhMapUtil { } public static void main(String[] args) { -// printField(new WomanHusband()); - printJsonByArray(WomanFetationRecordKeymap.alias); + printField(new DiagnoseAssit()); +// printJsonByArray(WomanFetationRecordKeymap.alias); } }