diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarMapper.java new file mode 100644 index 0000000..ccabdd4 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarMapper.java @@ -0,0 +1,5 @@ +package com.lyms.platform.permission.dao.master; + +public interface BabyPatientExtendEarMapper { + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 1e48a1e..db44108 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -1,7 +1,6 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.CouponInfo; -import com.lyms.platform.permission.model.Organization; import java.util.List; import java.util.Map; @@ -29,4 +28,5 @@ public interface CouponMapper { Set findTypes(Map param); + void update(Map param); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java new file mode 100644 index 0000000..f6582db --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java @@ -0,0 +1,17 @@ +package com.lyms.platform.permission.model; + +import java.util.UUID; + +/** + * uuid类型主键公共父类 + * @Author: litao + * @Date: 2017/5/12 0012 10:56 + * @Version: V1.0 + */ +public class AbstracUuidEntity extends AbstractEntity { + + @Override + protected void initId() { + setId(UUID.randomUUID().toString().replace("-", "")); + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstractEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstractEntity.java new file mode 100644 index 0000000..1436f1e --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstractEntity.java @@ -0,0 +1,32 @@ +package com.lyms.platform.permission.model; + +import java.io.Serializable; + +/** + * 公共实体类 + * @Author: litao + * @Date: 2017/5/12 0012 10:44 + * @Version: V1.0 + */ +public abstract class AbstractEntity implements Serializable { + + private static final long serialVersionUID = 2279616455169441008L; + + /** 主键 */ + protected PK id; + + protected PK getId() { + return id; + } + + protected void setId(PK id) { + this.id = id; + } + + protected abstract void initId(); + + public AbstractEntity() { + initId(); + } + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java new file mode 100644 index 0000000..ecaabf6 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java @@ -0,0 +1,120 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +/** + * 儿童建档基本信息 + * @date: 2017-05-11 11:49:07 + */ +public class BabyPatientExtendEar extends AbstracUuidEntity { + + /** + * 儿童id + */ + private String personId; + + private Date createDate; + + private String createUserId; + + private String createHospitalId; + + private Date lastUpdateDate; + + private String lastUpdateUserId; + + private String lastUpdateHospitalId; + + /** + * 听力高危因素 存字典表所对应的字段 多个用逗号分割 + */ + private String highRiskCause; + + /** + * 状态 1=正常 -1=禁用 + */ + private Integer status; + + public String getPersonId() { + return personId; + } + + public void setPersonId(String personId) { + this.personId = personId; + } + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + public String getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(String createUserId) { + this.createUserId = createUserId; + } + public String getCreateHospitalId() { + return createHospitalId; + } + + public void setCreateHospitalId(String createHospitalId) { + this.createHospitalId = createHospitalId; + } + public Date getLastUpdateDate() { + return lastUpdateDate; + } + + public void setLastUpdateDate(Date lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; + } + public String getLastUpdateUserId() { + return lastUpdateUserId; + } + + public void setLastUpdateUserId(String lastUpdateUserId) { + this.lastUpdateUserId = lastUpdateUserId; + } + public String getLastUpdateHospitalId() { + return lastUpdateHospitalId; + } + + public void setLastUpdateHospitalId(String lastUpdateHospitalId) { + this.lastUpdateHospitalId = lastUpdateHospitalId; + } + public String getHighRiskCause() { + return highRiskCause; + } + + public void setHighRiskCause(String highRiskCause) { + this.highRiskCause = highRiskCause; + } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("BabyPatientExtendEar [ "); + sb.append("id=" + id + ","); + sb.append("personId=" + personId + ","); + sb.append("createDate=" + createDate + ","); + sb.append("createUserId=" + createUserId + ","); + sb.append("createHospitalId=" + createHospitalId + ","); + sb.append("lastUpdateDate=" + lastUpdateDate + ","); + sb.append("lastUpdateUserId=" + lastUpdateUserId + ","); + sb.append("lastUpdateHospitalId=" + lastUpdateHospitalId + ","); + sb.append("highRiskCause=" + highRiskCause + ","); + sb.append("status=" + status + ","); + sb.replace(sb.length()-1, sb.length(), " ]"); + return sb.toString(); + } + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java new file mode 100644 index 0000000..a2cbfa8 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java @@ -0,0 +1,516 @@ +package com.lyms.platform.permission.model; + +import java.math.BigDecimal; + +/** + * 出生信息 + * @date: 2017-05-12 10:29:33 + */ +public class BabyPatientExtendEarBirth extends AbstracUuidEntity { + + /** + * 胎次 + */ + private Integer fetuNumber; + + /** + * 产次 + */ + private Integer productNumber; + + /** + * 出生体重 + */ + private BigDecimal birthWeight; + + /** + * 分娩方式 + */ + private Integer parturitionType; + + /** + * 出生缺陷类型: 1=有 -1=无 + */ + private Integer birthDefectType; + + /** + * 出生缺陷描述 + */ + private String birthDefectDesc; + + /** + * 胎儿窘迫： 1=有 -1=无 + */ + private Integer fetuEmbarrasType; + + /** + * 一分钟apgar评分 + */ + private BigDecimal apgarScoreOne; + + /** + * 五分钟apgar评分 + */ + private BigDecimal apgarScoreFive; + + /** + * 十分钟apgar评分 + */ + private BigDecimal apgarScoreTen; + + /** + * 产伤类型： 1=有 -1=无 + */ + private Integer birthInjuryType; + + /** + * 产伤部位 + */ + private String birthInjuryPosition; + + /** + * 羊水类型： 1= I度 2=II度 3=III度 + */ + private Integer amnioticFluidType; + + /** + * 异常分娩 1=有 -1=无 + */ + private Integer abnormalParturitionType; + + /** + * 异常分娩部位 + */ + private String abnormalParturitionPosition; + + /** + * 头颅、五观是否畸形 + */ + private Integer deformityType; + + /** + * 畸形部位 + */ + private String deformityPosition; + + /** + * 出生后感染 + */ + private Integer birthInfectionType; + + /** + * 感染病因 + */ + private String birthInfectionCause; + + /** + * 出生后感染病程 + */ + private String birthCourseDisease; + + /** + * 出生后患病 + */ + private Integer birthIllType; + + /** + * 出生后患病病因 + */ + private String birthIllCause; + + /** + * 出生后患病病程 + */ + private String birthIllDisease; + + /** + * 头部外伤史 + */ + private Integer headTraumaHistory; + + /** + * 头部外伤史详述 + */ + private String headTraumaDesc; + + /** + * 耳毒性药物应用史 + */ + private Integer earPoisonType; + + /** + * 药名 + */ + private String earPoisonName; + + /** + * 剂量 + */ + private String earPoisonNumber; + + /** + * 疗程 + */ + private String earPoisonCourse; + + /** + * 中耳炎史 + */ + private Integer tympanitisType; + + /** + * 中耳炎史详述 + */ + private String tympanitisDesc; + + /** + * 是否有nicu + */ + private Integer nicuType; + + /** + * nicu原因 + */ + private String nicuCause; + + /** + * nicu持续时间 + */ + private String nicuContinuedDate; + + /** + * 呼吸机使用 + */ + private Integer respiratorType; + + /** + * 呼吸机使用的持续时间 + */ + private String respiratorContinuedDate; + + /** + * 对外界声音和其他感官刺激的反应 1=灵敏 2=迟钝 + */ + private Integer outsideResponse; + + /** + * 所属建档的id + */ + private String babyPatientId; + + public Integer getFetuNumber() { + return fetuNumber; + } + + public void setFetuNumber(Integer fetuNumber) { + this.fetuNumber = fetuNumber; + } + public Integer getProductNumber() { + return productNumber; + } + + public void setProductNumber(Integer productNumber) { + this.productNumber = productNumber; + } + public BigDecimal getBirthWeight() { + return birthWeight; + } + + public void setBirthWeight(BigDecimal birthWeight) { + this.birthWeight = birthWeight; + } + public Integer getParturitionType() { + return parturitionType; + } + + public void setParturitionType(Integer parturitionType) { + this.parturitionType = parturitionType; + } + public Integer getBirthDefectType() { + return birthDefectType; + } + + public void setBirthDefectType(Integer birthDefectType) { + this.birthDefectType = birthDefectType; + } + public String getBirthDefectDesc() { + return birthDefectDesc; + } + + public void setBirthDefectDesc(String birthDefectDesc) { + this.birthDefectDesc = birthDefectDesc; + } + public Integer getFetuEmbarrasType() { + return fetuEmbarrasType; + } + + public void setFetuEmbarrasType(Integer fetuEmbarrasType) { + this.fetuEmbarrasType = fetuEmbarrasType; + } + public BigDecimal getApgarScoreOne() { + return apgarScoreOne; + } + + public void setApgarScoreOne(BigDecimal apgarScoreOne) { + this.apgarScoreOne = apgarScoreOne; + } + public BigDecimal getApgarScoreFive() { + return apgarScoreFive; + } + + public void setApgarScoreFive(BigDecimal apgarScoreFive) { + this.apgarScoreFive = apgarScoreFive; + } + public BigDecimal getApgarScoreTen() { + return apgarScoreTen; + } + + public void setApgarScoreTen(BigDecimal apgarScoreTen) { + this.apgarScoreTen = apgarScoreTen; + } + public Integer getBirthInjuryType() { + return birthInjuryType; + } + + public void setBirthInjuryType(Integer birthInjuryType) { + this.birthInjuryType = birthInjuryType; + } + public String getBirthInjuryPosition() { + return birthInjuryPosition; + } + + public void setBirthInjuryPosition(String birthInjuryPosition) { + this.birthInjuryPosition = birthInjuryPosition; + } + public Integer getAmnioticFluidType() { + return amnioticFluidType; + } + + public void setAmnioticFluidType(Integer amnioticFluidType) { + this.amnioticFluidType = amnioticFluidType; + } + public Integer getAbnormalParturitionType() { + return abnormalParturitionType; + } + + public void setAbnormalParturitionType(Integer abnormalParturitionType) { + this.abnormalParturitionType = abnormalParturitionType; + } + public String getAbnormalParturitionPosition() { + return abnormalParturitionPosition; + } + + public void setAbnormalParturitionPosition(String abnormalParturitionPosition) { + this.abnormalParturitionPosition = abnormalParturitionPosition; + } + public Integer getDeformityType() { + return deformityType; + } + + public void setDeformityType(Integer deformityType) { + this.deformityType = deformityType; + } + public String getDeformityPosition() { + return deformityPosition; + } + + public void setDeformityPosition(String deformityPosition) { + this.deformityPosition = deformityPosition; + } + public Integer getBirthInfectionType() { + return birthInfectionType; + } + + public void setBirthInfectionType(Integer birthInfectionType) { + this.birthInfectionType = birthInfectionType; + } + public String getBirthInfectionCause() { + return birthInfectionCause; + } + + public void setBirthInfectionCause(String birthInfectionCause) { + this.birthInfectionCause = birthInfectionCause; + } + public String getBirthCourseDisease() { + return birthCourseDisease; + } + + public void setBirthCourseDisease(String birthCourseDisease) { + this.birthCourseDisease = birthCourseDisease; + } + public Integer getBirthIllType() { + return birthIllType; + } + + public void setBirthIllType(Integer birthIllType) { + this.birthIllType = birthIllType; + } + public String getBirthIllCause() { + return birthIllCause; + } + + public void setBirthIllCause(String birthIllCause) { + this.birthIllCause = birthIllCause; + } + public String getBirthIllDisease() { + return birthIllDisease; + } + + public void setBirthIllDisease(String birthIllDisease) { + this.birthIllDisease = birthIllDisease; + } + public Integer getHeadTraumaHistory() { + return headTraumaHistory; + } + + public void setHeadTraumaHistory(Integer headTraumaHistory) { + this.headTraumaHistory = headTraumaHistory; + } + public String getHeadTraumaDesc() { + return headTraumaDesc; + } + + public void setHeadTraumaDesc(String headTraumaDesc) { + this.headTraumaDesc = headTraumaDesc; + } + public Integer getEarPoisonType() { + return earPoisonType; + } + + public void setEarPoisonType(Integer earPoisonType) { + this.earPoisonType = earPoisonType; + } + public String getEarPoisonName() { + return earPoisonName; + } + + public void setEarPoisonName(String earPoisonName) { + this.earPoisonName = earPoisonName; + } + public String getEarPoisonNumber() { + return earPoisonNumber; + } + + public void setEarPoisonNumber(String earPoisonNumber) { + this.earPoisonNumber = earPoisonNumber; + } + public String getEarPoisonCourse() { + return earPoisonCourse; + } + + public void setEarPoisonCourse(String earPoisonCourse) { + this.earPoisonCourse = earPoisonCourse; + } + public Integer getTympanitisType() { + return tympanitisType; + } + + public void setTympanitisType(Integer tympanitisType) { + this.tympanitisType = tympanitisType; + } + public String getTympanitisDesc() { + return tympanitisDesc; + } + + public void setTympanitisDesc(String tympanitisDesc) { + this.tympanitisDesc = tympanitisDesc; + } + public Integer getNicuType() { + return nicuType; + } + + public void setNicuType(Integer nicuType) { + this.nicuType = nicuType; + } + public String getNicuCause() { + return nicuCause; + } + + public void setNicuCause(String nicuCause) { + this.nicuCause = nicuCause; + } + public String getNicuContinuedDate() { + return nicuContinuedDate; + } + + public void setNicuContinuedDate(String nicuContinuedDate) { + this.nicuContinuedDate = nicuContinuedDate; + } + public Integer getRespiratorType() { + return respiratorType; + } + + public void setRespiratorType(Integer respiratorType) { + this.respiratorType = respiratorType; + } + public String getRespiratorContinuedDate() { + return respiratorContinuedDate; + } + + public void setRespiratorContinuedDate(String respiratorContinuedDate) { + this.respiratorContinuedDate = respiratorContinuedDate; + } + public Integer getOutsideResponse() { + return outsideResponse; + } + + public void setOutsideResponse(Integer outsideResponse) { + this.outsideResponse = outsideResponse; + } + public String getBabyPatientId() { + return babyPatientId; + } + + public void setBabyPatientId(String babyPatientId) { + this.babyPatientId = babyPatientId; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("BabyPatientExtendEarBirth [ "); + sb.append("id=" + id + ","); + sb.append("fetuNumber=" + fetuNumber + ","); + sb.append("productNumber=" + productNumber + ","); + sb.append("birthWeight=" + birthWeight + ","); + sb.append("parturitionType=" + parturitionType + ","); + sb.append("birthDefectType=" + birthDefectType + ","); + sb.append("birthDefectDesc=" + birthDefectDesc + ","); + sb.append("fetuEmbarrasType=" + fetuEmbarrasType + ","); + sb.append("apgarScoreOne=" + apgarScoreOne + ","); + sb.append("apgarScoreFive=" + apgarScoreFive + ","); + sb.append("apgarScoreTen=" + apgarScoreTen + ","); + sb.append("birthInjuryType=" + birthInjuryType + ","); + sb.append("birthInjuryPosition=" + birthInjuryPosition + ","); + sb.append("amnioticFluidType=" + amnioticFluidType + ","); + sb.append("abnormalParturitionType=" + abnormalParturitionType + ","); + sb.append("abnormalParturitionPosition=" + abnormalParturitionPosition + ","); + sb.append("deformityType=" + deformityType + ","); + sb.append("deformityPosition=" + deformityPosition + ","); + sb.append("birthInfectionType=" + birthInfectionType + ","); + sb.append("birthInfectionCause=" + birthInfectionCause + ","); + sb.append("birthCourseDisease=" + birthCourseDisease + ","); + sb.append("birthIllType=" + birthIllType + ","); + sb.append("birthIllCause=" + birthIllCause + ","); + sb.append("birthIllDisease=" + birthIllDisease + ","); + sb.append("headTraumaHistory=" + headTraumaHistory + ","); + sb.append("headTraumaDesc=" + headTraumaDesc + ","); + sb.append("earPoisonType=" + earPoisonType + ","); + sb.append("earPoisonName=" + earPoisonName + ","); + sb.append("earPoisonNumber=" + earPoisonNumber + ","); + sb.append("earPoisonCourse=" + earPoisonCourse + ","); + sb.append("tympanitisType=" + tympanitisType + ","); + sb.append("tympanitisDesc=" + tympanitisDesc + ","); + sb.append("nicuType=" + nicuType + ","); + sb.append("nicuCause=" + nicuCause + ","); + sb.append("nicuContinuedDate=" + nicuContinuedDate + ","); + sb.append("respiratorType=" + respiratorType + ","); + sb.append("respiratorContinuedDate=" + respiratorContinuedDate + ","); + sb.append("outsideResponse=" + outsideResponse + ","); + sb.append("babyPatientId=" + babyPatientId + ","); + sb.replace(sb.length()-1, sb.length(), " ]"); + return sb.toString(); + } + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamily.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamily.java new file mode 100644 index 0000000..477f7df --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamily.java @@ -0,0 +1,124 @@ +package com.lyms.platform.permission.model; + +/** + * 家族史 + * @date: 2017-05-12 10:29:33 + */ +public class BabyPatientExtendEarFamily extends AbstracUuidEntity { + + /** + * 是否有家庭不良生活习惯 + */ + private Integer badLifeHistoryType; + + /** + * 庭不良生活习惯类型 1=吸烟 2=饮酒 3=吸毒 + */ + private String badLifeTypeId; + + /** + * 家族中是否有耳聋患者 + */ + private Integer deafType; + + /** + * 耳聋患者与儿童的亲属关系 + */ + private String deatRelationship; + + /** + * 耳聋详情 + */ + private String deafDesc; + + /** + * 是否近亲结婚 + */ + private Integer proximityType; + + /** + * 血缘关系 + */ + private String proximityRelationship; + + /** + * 儿童建档的主键 + */ + private String babyPatientId; + + public Integer getBadLifeHistoryType() { + return badLifeHistoryType; + } + + public void setBadLifeHistoryType(Integer badLifeHistoryType) { + this.badLifeHistoryType = badLifeHistoryType; + } + public String getBadLifeTypeId() { + return badLifeTypeId; + } + + public void setBadLifeTypeId(String badLifeTypeId) { + this.badLifeTypeId = badLifeTypeId; + } + public Integer getDeafType() { + return deafType; + } + + public void setDeafType(Integer deafType) { + this.deafType = deafType; + } + public String getDeatRelationship() { + return deatRelationship; + } + + public void setDeatRelationship(String deatRelationship) { + this.deatRelationship = deatRelationship; + } + public String getDeafDesc() { + return deafDesc; + } + + public void setDeafDesc(String deafDesc) { + this.deafDesc = deafDesc; + } + public Integer getProximityType() { + return proximityType; + } + + public void setProximityType(Integer proximityType) { + this.proximityType = proximityType; + } + public String getProximityRelationship() { + return proximityRelationship; + } + + public void setProximityRelationship(String proximityRelationship) { + this.proximityRelationship = proximityRelationship; + } + public String getBabyPatientId() { + return babyPatientId; + } + + public void setBabyPatientId(String babyPatientId) { + this.babyPatientId = babyPatientId; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("BabyPatientExtendEarFamily [ "); + sb.append("id=" + id + ","); + sb.append("badLifeHistoryType=" + badLifeHistoryType + ","); + sb.append("badLifeTypeId=" + badLifeTypeId + ","); + sb.append("deafType=" + deafType + ","); + sb.append("deatRelationship=" + deatRelationship + ","); + sb.append("deafDesc=" + deafDesc + ","); + sb.append("proximityType=" + proximityType + ","); + sb.append("proximityRelationship=" + proximityRelationship + ","); + sb.append("babyPatientId=" + babyPatientId + ","); + sb.replace(sb.length()-1, sb.length(), " ]"); + return sb.toString(); + } + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java new file mode 100644 index 0000000..880de67 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java @@ -0,0 +1,412 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +/** + * 儿童建档的母亲壬辰详情 + * @date: 2017-05-12 10:29:33 + */ +public class BabyPatientExtendEarMother extends AbstracUuidEntity { + + /** + * 妊娠年龄 + */ + private Integer gestationAge; + + /** + * 是否有流产史 1=有 -1=无 + */ + private Integer abortionHistoryType; + + /** + * 流产时间 + */ + private Date abortionDate; + + /** + * 流产原因 + */ + private String abortionCause; + + /** + * 流产方式 1=药物流产 + */ + private Integer abortionType; + + /** + * 妊娠期病毒感染史 + */ + private Integer viralInfectionHistoryType; + + /** + * 妊娠期病毒感染史类型：风疹 巨细胞病毒 疱疹 弓形虫 其他产考字典表 + */ + private String viralInfectionTypeId; + + /** + * 妊娠期病毒感染史其他类型的 描述信息 + */ + private String viralInfectionOtherDesc; + + /** + * 妊娠期病毒感染史的孕周数 + */ + private Integer viralInfectionDate; + + /** + * 妊娠期外生殖器感染史 1=有 -1=无 + */ + private Integer genitalInfectionHistoryType; + + /** + * 妊娠期外生殖器感染史类型 1=淋病 2=梅毒 3=尖锐湿疹 4=其他 + */ + private String genitalInfectionTypeId; + + /** + * 妊娠期外生殖器感染史其他类型的描述信息 + */ + private String genitalInfectionOtherDesc; + + /** + * 妊娠期外生殖器感染史孕周数 + */ + private Integer genitalInfectionDate; + + /** + * 妊娠期放射性物质接触史 + */ + private Integer radiationType; + + /** + * 妊娠期放射性物质接触孕周 + */ + private Date radiationDate; + + /** + * 妊娠期药物应用史 + */ + private Integer drugAppType; + + /** + * 药物名称 + */ + private String drugAppName; + + /** + * 用药时间 + */ + private Date drugAppUseDate; + + /** + * 有害物接触史 + */ + private Integer harmfulSubstanceType; + + /** + * 有害物的名称 + */ + private String harmfulSubstanceName; + + /** + * 接触有害物的时间 + */ + private Date harmfulSubstanceDate; + + /** + * 妊娠期不良生活习惯史 + */ + private Integer badLifeHistoryType; + + /** + * 妊娠期不良生活的类型 1=吸烟 2=饮酒 3=吸毒 + */ + private String badLifeTypeId; + + /** + * 是否有妊娠期病史 + */ + private Integer medicalHistoryType; + + /** + * 妊娠期病史病史类型 1=糖尿病 2=肾炎 3=甲状腺功能减退 4=败血症 5=其他 + */ + private Integer medicalTypeId; + + /** + * 妊娠期病史其他病史类型的描述 + */ + private String medicalOtherTypeDesc; + + /** + * 是否有异常妊娠 + */ + private Integer bnormalPregnancyHistoryType; + + /** + * 异常类型总和 1=妊高症 2=胎儿宫发育迟缓 3=母婴血型不和 4=其他 + */ + private String bnormalPregnancyTypeId; + + /** + * 其他类型的描述 + */ + private String bnormalPregnancyOtherDesc; + + /** + * 儿童建档的主键 + */ + private String babyPatientId; + + public Integer getGestationAge() { + return gestationAge; + } + + public void setGestationAge(Integer gestationAge) { + this.gestationAge = gestationAge; + } + public Integer getAbortionHistoryType() { + return abortionHistoryType; + } + + public void setAbortionHistoryType(Integer abortionHistoryType) { + this.abortionHistoryType = abortionHistoryType; + } + public Date getAbortionDate() { + return abortionDate; + } + + public void setAbortionDate(Date abortionDate) { + this.abortionDate = abortionDate; + } + public String getAbortionCause() { + return abortionCause; + } + + public void setAbortionCause(String abortionCause) { + this.abortionCause = abortionCause; + } + public Integer getAbortionType() { + return abortionType; + } + + public void setAbortionType(Integer abortionType) { + this.abortionType = abortionType; + } + public Integer getViralInfectionHistoryType() { + return viralInfectionHistoryType; + } + + public void setViralInfectionHistoryType(Integer viralInfectionHistoryType) { + this.viralInfectionHistoryType = viralInfectionHistoryType; + } + public String getViralInfectionTypeId() { + return viralInfectionTypeId; + } + + public void setViralInfectionTypeId(String viralInfectionTypeId) { + this.viralInfectionTypeId = viralInfectionTypeId; + } + public String getViralInfectionOtherDesc() { + return viralInfectionOtherDesc; + } + + public void setViralInfectionOtherDesc(String viralInfectionOtherDesc) { + this.viralInfectionOtherDesc = viralInfectionOtherDesc; + } + public Integer getViralInfectionDate() { + return viralInfectionDate; + } + + public void setViralInfectionDate(Integer viralInfectionDate) { + this.viralInfectionDate = viralInfectionDate; + } + public Integer getGenitalInfectionHistoryType() { + return genitalInfectionHistoryType; + } + + public void setGenitalInfectionHistoryType(Integer genitalInfectionHistoryType) { + this.genitalInfectionHistoryType = genitalInfectionHistoryType; + } + public String getGenitalInfectionTypeId() { + return genitalInfectionTypeId; + } + + public void setGenitalInfectionTypeId(String genitalInfectionTypeId) { + this.genitalInfectionTypeId = genitalInfectionTypeId; + } + public String getGenitalInfectionOtherDesc() { + return genitalInfectionOtherDesc; + } + + public void setGenitalInfectionOtherDesc(String genitalInfectionOtherDesc) { + this.genitalInfectionOtherDesc = genitalInfectionOtherDesc; + } + public Integer getGenitalInfectionDate() { + return genitalInfectionDate; + } + + public void setGenitalInfectionDate(Integer genitalInfectionDate) { + this.genitalInfectionDate = genitalInfectionDate; + } + public Integer getRadiationType() { + return radiationType; + } + + public void setRadiationType(Integer radiationType) { + this.radiationType = radiationType; + } + public Date getRadiationDate() { + return radiationDate; + } + + public void setRadiationDate(Date radiationDate) { + this.radiationDate = radiationDate; + } + public Integer getDrugAppType() { + return drugAppType; + } + + public void setDrugAppType(Integer drugAppType) { + this.drugAppType = drugAppType; + } + public String getDrugAppName() { + return drugAppName; + } + + public void setDrugAppName(String drugAppName) { + this.drugAppName = drugAppName; + } + public Date getDrugAppUseDate() { + return drugAppUseDate; + } + + public void setDrugAppUseDate(Date drugAppUseDate) { + this.drugAppUseDate = drugAppUseDate; + } + public Integer getHarmfulSubstanceType() { + return harmfulSubstanceType; + } + + public void setHarmfulSubstanceType(Integer harmfulSubstanceType) { + this.harmfulSubstanceType = harmfulSubstanceType; + } + public String getHarmfulSubstanceName() { + return harmfulSubstanceName; + } + + public void setHarmfulSubstanceName(String harmfulSubstanceName) { + this.harmfulSubstanceName = harmfulSubstanceName; + } + public Date getHarmfulSubstanceDate() { + return harmfulSubstanceDate; + } + + public void setHarmfulSubstanceDate(Date harmfulSubstanceDate) { + this.harmfulSubstanceDate = harmfulSubstanceDate; + } + public Integer getBadLifeHistoryType() { + return badLifeHistoryType; + } + + public void setBadLifeHistoryType(Integer badLifeHistoryType) { + this.badLifeHistoryType = badLifeHistoryType; + } + public String getBadLifeTypeId() { + return badLifeTypeId; + } + + public void setBadLifeTypeId(String badLifeTypeId) { + this.badLifeTypeId = badLifeTypeId; + } + public Integer getMedicalHistoryType() { + return medicalHistoryType; + } + + public void setMedicalHistoryType(Integer medicalHistoryType) { + this.medicalHistoryType = medicalHistoryType; + } + public Integer getMedicalTypeId() { + return medicalTypeId; + } + + public void setMedicalTypeId(Integer medicalTypeId) { + this.medicalTypeId = medicalTypeId; + } + public String getMedicalOtherTypeDesc() { + return medicalOtherTypeDesc; + } + + public void setMedicalOtherTypeDesc(String medicalOtherTypeDesc) { + this.medicalOtherTypeDesc = medicalOtherTypeDesc; + } + public Integer getBnormalPregnancyHistoryType() { + return bnormalPregnancyHistoryType; + } + + public void setBnormalPregnancyHistoryType(Integer bnormalPregnancyHistoryType) { + this.bnormalPregnancyHistoryType = bnormalPregnancyHistoryType; + } + public String getBnormalPregnancyTypeId() { + return bnormalPregnancyTypeId; + } + + public void setBnormalPregnancyTypeId(String bnormalPregnancyTypeId) { + this.bnormalPregnancyTypeId = bnormalPregnancyTypeId; + } + public String getBnormalPregnancyOtherDesc() { + return bnormalPregnancyOtherDesc; + } + + public void setBnormalPregnancyOtherDesc(String bnormalPregnancyOtherDesc) { + this.bnormalPregnancyOtherDesc = bnormalPregnancyOtherDesc; + } + public String getBabyPatientId() { + return babyPatientId; + } + + public void setBabyPatientId(String babyPatientId) { + this.babyPatientId = babyPatientId; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("BabyPatientExtendEarMother [ "); + sb.append("id=" + id + ","); + sb.append("gestationAge=" + gestationAge + ","); + sb.append("abortionHistoryType=" + abortionHistoryType + ","); + sb.append("abortionDate=" + abortionDate + ","); + sb.append("abortionCause=" + abortionCause + ","); + sb.append("abortionType=" + abortionType + ","); + sb.append("viralInfectionHistoryType=" + viralInfectionHistoryType + ","); + sb.append("viralInfectionTypeId=" + viralInfectionTypeId + ","); + sb.append("viralInfectionOtherDesc=" + viralInfectionOtherDesc + ","); + sb.append("viralInfectionDate=" + viralInfectionDate + ","); + sb.append("genitalInfectionHistoryType=" + genitalInfectionHistoryType + ","); + sb.append("genitalInfectionTypeId=" + genitalInfectionTypeId + ","); + sb.append("genitalInfectionOtherDesc=" + genitalInfectionOtherDesc + ","); + sb.append("genitalInfectionDate=" + genitalInfectionDate + ","); + sb.append("radiationType=" + radiationType + ","); + sb.append("radiationDate=" + radiationDate + ","); + sb.append("drugAppType=" + drugAppType + ","); + sb.append("drugAppName=" + drugAppName + ","); + sb.append("drugAppUseDate=" + drugAppUseDate + ","); + sb.append("harmfulSubstanceType=" + harmfulSubstanceType + ","); + sb.append("harmfulSubstanceName=" + harmfulSubstanceName + ","); + sb.append("harmfulSubstanceDate=" + harmfulSubstanceDate + ","); + sb.append("badLifeHistoryType=" + badLifeHistoryType + ","); + sb.append("badLifeTypeId=" + badLifeTypeId + ","); + sb.append("medicalHistoryType=" + medicalHistoryType + ","); + sb.append("medicalTypeId=" + medicalTypeId + ","); + sb.append("medicalOtherTypeDesc=" + medicalOtherTypeDesc + ","); + sb.append("bnormalPregnancyHistoryType=" + bnormalPregnancyHistoryType + ","); + sb.append("bnormalPregnancyTypeId=" + bnormalPregnancyTypeId + ","); + sb.append("bnormalPregnancyOtherDesc=" + bnormalPregnancyOtherDesc + ","); + sb.append("babyPatientId=" + babyPatientId + ","); + sb.replace(sb.length()-1, sb.length(), " ]"); + return sb.toString(); + } + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java new file mode 100644 index 0000000..aadcc07 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java @@ -0,0 +1,248 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +/** + * 听力筛查 + * @date: 2017-05-12 10:29:33 + */ +public class BabyPatientExtendEarScreen extends AbstracUuidEntity { + + private String babyId; + + /** + * 筛查类型 1=初筛 2=复筛 + */ + private Integer screenType; + + /** + * 检查医院的id + */ + private String checkHospitalId; + + /** + * 筛查时间 + */ + private Date screenDate; + + /** + * 高危因素 1=早产 2=晚产 + */ + private Integer highRiskCause; + + /** + * 左耳检查结果 1=通过 -1=未通过 + */ + private Integer oaeLeft; + + /** + * 右耳检查结果 1=通过 -1=未通过 + */ + private Integer oaeRight; + + /** + * 听力基因GJB2-35 del G 的值 1=野生型 + */ + private Integer gjb2Del35; + + private Integer gjb2Del176; + + private Integer gjb2Del235; + + private Integer gjb2Del299; + + private Integer gjb3Slc26a4538; + + private Integer gjb3Slc26a42168; + + private Integer gjb3Slc26a4Ivs7; + + /** + * 处理意见 1=复筛 2=诊断 + */ + private Integer processOptionType; + + /** + * 处理意见 描述信息 + */ + private String processOptionDesc; + + /** + * 指导意见 + */ + private String guidOpinion; + + /** + * 检查医生 + */ + private String checkDoctorId; + + /** + * 诊断时间 + */ + private Date referralDate; + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + public Integer getScreenType() { + return screenType; + } + + public void setScreenType(Integer screenType) { + this.screenType = screenType; + } + public String getCheckHospitalId() { + return checkHospitalId; + } + + public void setCheckHospitalId(String checkHospitalId) { + this.checkHospitalId = checkHospitalId; + } + public Date getScreenDate() { + return screenDate; + } + + public void setScreenDate(Date screenDate) { + this.screenDate = screenDate; + } + public Integer getHighRiskCause() { + return highRiskCause; + } + + public void setHighRiskCause(Integer highRiskCause) { + this.highRiskCause = highRiskCause; + } + public Integer getOaeLeft() { + return oaeLeft; + } + + public void setOaeLeft(Integer oaeLeft) { + this.oaeLeft = oaeLeft; + } + public Integer getOaeRight() { + return oaeRight; + } + + public void setOaeRight(Integer oaeRight) { + this.oaeRight = oaeRight; + } + public Integer getGjb2Del35() { + return gjb2Del35; + } + + public void setGjb2Del35(Integer gjb2Del35) { + this.gjb2Del35 = gjb2Del35; + } + public Integer getGjb2Del176() { + return gjb2Del176; + } + + public void setGjb2Del176(Integer gjb2Del176) { + this.gjb2Del176 = gjb2Del176; + } + public Integer getGjb2Del235() { + return gjb2Del235; + } + + public void setGjb2Del235(Integer gjb2Del235) { + this.gjb2Del235 = gjb2Del235; + } + public Integer getGjb2Del299() { + return gjb2Del299; + } + + public void setGjb2Del299(Integer gjb2Del299) { + this.gjb2Del299 = gjb2Del299; + } + public Integer getGjb3Slc26a4538() { + return gjb3Slc26a4538; + } + + public void setGjb3Slc26a4538(Integer gjb3Slc26a4538) { + this.gjb3Slc26a4538 = gjb3Slc26a4538; + } + public Integer getGjb3Slc26a42168() { + return gjb3Slc26a42168; + } + + public void setGjb3Slc26a42168(Integer gjb3Slc26a42168) { + this.gjb3Slc26a42168 = gjb3Slc26a42168; + } + public Integer getGjb3Slc26a4Ivs7() { + return gjb3Slc26a4Ivs7; + } + + public void setGjb3Slc26a4Ivs7(Integer gjb3Slc26a4Ivs7) { + this.gjb3Slc26a4Ivs7 = gjb3Slc26a4Ivs7; + } + public Integer getProcessOptionType() { + return processOptionType; + } + + public void setProcessOptionType(Integer processOptionType) { + this.processOptionType = processOptionType; + } + public String getProcessOptionDesc() { + return processOptionDesc; + } + + public void setProcessOptionDesc(String processOptionDesc) { + this.processOptionDesc = processOptionDesc; + } + public String getGuidOpinion() { + return guidOpinion; + } + + public void setGuidOpinion(String guidOpinion) { + this.guidOpinion = guidOpinion; + } + public String getCheckDoctorId() { + return checkDoctorId; + } + + public void setCheckDoctorId(String checkDoctorId) { + this.checkDoctorId = checkDoctorId; + } + public Date getReferralDate() { + return referralDate; + } + + public void setReferralDate(Date referralDate) { + this.referralDate = referralDate; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("BabyPatientExtendEarScreen [ "); + sb.append("id=" + id + ","); + sb.append("babyId=" + babyId + ","); + sb.append("screenType=" + screenType + ","); + sb.append("checkHospitalId=" + checkHospitalId + ","); + sb.append("screenDate=" + screenDate + ","); + sb.append("highRiskCause=" + highRiskCause + ","); + sb.append("oaeLeft=" + oaeLeft + ","); + sb.append("oaeRight=" + oaeRight + ","); + sb.append("gjb2Del35=" + gjb2Del35 + ","); + sb.append("gjb2Del176=" + gjb2Del176 + ","); + sb.append("gjb2Del235=" + gjb2Del235 + ","); + sb.append("gjb2Del299=" + gjb2Del299 + ","); + sb.append("gjb3Slc26a4538=" + gjb3Slc26a4538 + ","); + sb.append("gjb3Slc26a42168=" + gjb3Slc26a42168 + ","); + sb.append("gjb3Slc26a4Ivs7=" + gjb3Slc26a4Ivs7 + ","); + sb.append("processOptionType=" + processOptionType + ","); + sb.append("processOptionDesc=" + processOptionDesc + ","); + sb.append("guidOpinion=" + guidOpinion + ","); + sb.append("checkDoctorId=" + checkDoctorId + ","); + sb.append("referralDate=" + referralDate + ","); + sb.replace(sb.length()-1, sb.length(), " ]"); + return sb.toString(); + } + + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarService.java new file mode 100644 index 0000000..200edd3 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarService.java @@ -0,0 +1,14 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.permission.model.BabyPatientExtendEar; +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; + +public interface BabyPatientExtendEarService { + + BaseObjectResponse insert(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, Integer userId); + + BaseObjectResponse getConfigs(); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index f763781..016476e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -15,7 +15,7 @@ public interface CouponService{ BaseObjectResponse validate(String code, Integer type, String hospitalId); - BaseObjectResponse findList(String userId, String hospitalId, String url); + BaseObjectResponse findList(String userId, String hospitalId); BaseObjectResponse use(String hospitalId, String code, Integer userId); @@ -24,4 +24,6 @@ public interface CouponService{ Map getPatientsInfo(String userId); Map getPatientsInfoByCode(String code); + + void del(String userId, String hospitalId, String delUserId); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java new file mode 100644 index 0000000..9284dba --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java @@ -0,0 +1,35 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.permission.dao.master.BabyPatientExtendEarMapper; +import com.lyms.platform.permission.model.BabyPatientExtendEar; +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; +import com.lyms.platform.permission.service.BabyPatientExtendEarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.stereotype.Service; + +@Service +public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarService { + + @Autowired + private MongoTemplate mongoTemplate; + + @Autowired + private BabyPatientExtendEarMapper earMapper; + + @Override + public BaseObjectResponse insert(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, + BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, Integer userId) { + System.out.println("ear = [" + ear + "], earBirth = [" + earBirth + "], earMother = [" + earMother + "], earFamily = [" + earFamily + "], userId = [" + userId + "]"); + return RespBuilder.buildSuccess(); + } + + @Override + public BaseObjectResponse getConfigs() { + return null; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 6812681..48cc019 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -36,6 +37,9 @@ public class CouponServiceImpl implements CouponService { private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class); + @Value("${or.code.url}") + private String url; + /** 1 = 孕妇 */ private static final String PREGNANT_WOMAN = "1"; @@ -70,7 +74,7 @@ public class CouponServiceImpl implements CouponService { * 生成规则： * 孕妇 建档、产检、分娩、出院小结、产后复查 * 产妇 建档、出院小结、产后复查 - * 产妇没有分娩记录且没有出院小结： 分娩、出院小结、产后复查 + * 产妇没有分娩记录且没有出院小结： 分娩、出院小结、产后复查、建档券 * 产妇有分娩记录且没有出院小结： 出院小结、产后复查 * 产妇有分娩记录且有出院小结： 产后复查 * 儿童 建档、儿童保健 @@ -82,7 +86,7 @@ public class CouponServiceImpl implements CouponService { { put(PREGNANT_WOMAN, Arrays.asList(1, 2, 4, 5, 6)); put(CHILDREN, Arrays.asList(7, 8)); - put(MATERNAL_NCHILDBIRTH_NHOSPITAL, Arrays.asList(4, 5, 6)); + put(MATERNAL_NCHILDBIRTH_NHOSPITAL, Arrays.asList(3, 4, 5, 6)); put(MATERNAL_YCHILDBIRTH_NHOSPITAL, Arrays.asList(5, 6)); put(MATERNAL_YCHILDBIRTH_YHOSPITAL, Arrays.asList(6)); put(PUT_ON_RECORD, Arrays.asList(1, 3, 7)); @@ -144,7 +148,14 @@ public class CouponServiceImpl implements CouponService { if(type != null && typeMap.get(PUT_ON_RECORD).contains(Integer.parseInt(type.toString()))) { couponInfo.setStatus(2); Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); - if(patients != null) { + if(patients == null) { /** 不是孕妇就是儿童 */ + BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); + if(baby != null) { + couponInfo.setUseDate(baby.getBuildDate()); + couponInfo.setOperatorUseId(baby.getBuildDoctor()); + couponInfo.setUsedHospitalId(baby.getHospitalId()); + } + } else if(patients != null){ couponInfo.setUseDate(patients.getBookbuildingDate()); couponInfo.setOperatorUseId(patients.getBookbuildingDoctor()); couponInfo.setUsedHospitalId(patients.getHospitalId()); @@ -284,6 +295,24 @@ public class CouponServiceImpl implements CouponService { return null; } + /** + * 当删除孕妇或儿童档案时，默认修改该孕妇和儿童下所有的优惠券为已删除的状态 + * 操作人为当前登陆人的id + * @param userId 登陆人的id + * @param hospitalId 医院id + * @param delUserId 被删除优惠券人的id + */ + @Override + public void del(String userId, String hospitalId, String delUserId) { + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); + param.put("operatorUseId", userId); + param.put("status", 2); + param.put("useDate", new Date()); + param.put("userId", delUserId); + couponMapper.update(param); + } + /** 1=省 2=市 3=区 4=单医院 */ private boolean validateArea(String areaType, String createHospitalId, String useHospitald) { Organization createHospital = organizationService.getOrganization(Integer.parseInt(createHospitalId)); @@ -323,18 +352,22 @@ public class CouponServiceImpl implements CouponService { Date midDate = null; Date startDate = null; Date endDate = null; -// if(couponType == 1) {/** 根据末次月经对比 midDate = 末次月经时间 */ if(typeMap.get(PREGNANT_WOMAN).contains(couponType)) {/** 孕妇: 根据末次月经对比 midDate = 末次月经时间 */ List patients = mongoTemplate.find(Query.query(Criteria.where("type").is(1).and("hospitalId").is(hospitalId).and("pid").is(userId)), Patients.class); if(CollectionUtils.isEmpty(patients)) { - logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 1 的孕妇信息"); - return false; + BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); + if(baby != null) {/** 孕妇没查到就查儿童 */ + midDate = baby.getBirth(); + } else { + logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 1 的信息"); + return false; + } } midDate = patients.get(0).getLastMenses(); -// } else if(couponType == 2 || couponType == 3) {/** 根据分娩时间对比 midDate = 分娩时间 */ } else {/** 产妇或者儿童：根据分娩时间对比 midDate = 分娩时间 */ List patients = mongoTemplate.find(Query.query(Criteria.where("type").is(3).and("hospitalId").is(hospitalId).and("pid").is(userId)) .with(new Sort(Sort.Direction.DESC, "fmDate")), Patients.class); + if(CollectionUtils.isEmpty(patients)) { logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 3 的孕妇信息"); return false; @@ -353,7 +386,8 @@ public class CouponServiceImpl implements CouponService { startDate = DateUtils.addMonths(midDate, start); endDate = DateUtils.addMonths(midDate, end + 1); } - if(DateUtil.isBetween(midDate, startDate, endDate)) { +// if(DateUtil.isBetween(midDate, startDate, endDate)) { + if(DateUtil.isBetween(new Date(), startDate, endDate)) { return true; } } @@ -361,7 +395,7 @@ public class CouponServiceImpl implements CouponService { } @Override - public BaseObjectResponse findList(String userId, String hospitalId, String url) { + public BaseObjectResponse findList(String userId, String hospitalId) { Map param = new HashMap<>(); param.put("userId", userId); param.put("hospitalId", hospitalId); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMapper.xml new file mode 100644 index 0000000..368a820 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMapper.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status + + + + + + and id = #{id} + + + and person_id = #{personId} + + + and create_date = #{createDate} + + + and create_user_id = #{createUserId} + + + and create_hospital_id = #{createHospitalId} + + + and last_update_date = #{lastUpdateDate} + + + and last_update_user_id = #{lastUpdateUserId} + + + and last_update_hospital_id = #{lastUpdateHospitalId} + + + and high_risk_cause = #{highRiskCause} + + + and status = #{status} + + + + + + + + person_id = #{personId}, + + + create_date = #{createDate}, + + + create_user_id = #{createUserId}, + + + create_hospital_id = #{createHospitalId}, + + + last_update_date = #{lastUpdateDate}, + + + last_update_user_id = #{lastUpdateUserId}, + + + last_update_hospital_id = #{lastUpdateHospitalId}, + + + high_risk_cause = #{highRiskCause}, + + + status = #{status} + + + + + + + + + + + + + + insert into baby_patient_extend_ear() values(#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status}) + + + + delete from baby_patient_extend_ear where id = #{id} + + + + delete from baby_patient_extend_ear where id in + + #{id} + + + + + update baby_patient_extend_ear + + where id = #{id} + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index f93e805..0bc7753 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -19,7 +19,7 @@ - sequence_id,create_date,use_date,user_id,create_user_id,coupon_template_id,create_hospital_id,used_hospital_id,status + sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_hospital_id,status - insert into coupon_info(id, ) values(#{id},#{sequenceId},#{createDate},#{useDate},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) + insert into coupon_info(id, ) values(#{id},#{sequenceId},#{createDate},#{useDate},#{operatorUseId},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) select b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status - from coupon_info a, coupon_template b - where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id + from coupon_info a, coupon_template b, coupon_type c + where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id + order by c.type, b.coupon_order select c.type from hospital_coupon_template_group a,coupon_template b, coupon_type c diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java b/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java index a5ada56..212b97a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java @@ -4,49 +4,57 @@ package com.lyms.platform.common.result; import com.lyms.platform.common.utils.DateUtil; /** - * 基础的返回模型 + * 基础的返回模型 * * @author Administrator + * */ public class BaseResponse extends BaseModel { - /** - * - */ - private static final long serialVersionUID = 1L; - - protected String errormsg; - protected int errorcode; - - public String getNow() { - return DateUtil.getymd(); - } - - public BaseResponse() { - super(); - } - - public BaseResponse(String errormsg, int errorcode) { - super(); - this.errormsg = errormsg; - this.errorcode = errorcode; - } - - public String getErrormsg() { - return errormsg; - } - - public BaseResponse setErrormsg(String errormsg) { - this.errormsg = errormsg; - return this; - } - - public BaseResponse setErrorcode(int errorcode) { - this.errorcode = errorcode; - return this; - } - - public int getErrorcode() { - return errorcode; - } + /** + * + */ + private static final long serialVersionUID = 1L; + + protected String errormsg; + protected int errorcode; + private Object object; + + public String getNow() { + return DateUtil.getymd(); + } + + public BaseResponse() { + super(); + } + + public BaseResponse(String errormsg, int errorcode) { + super(); + this.errormsg = errormsg; + this.errorcode = errorcode; + } + + public String getErrormsg() { + return errormsg; + } + + public BaseResponse setErrormsg(String errormsg) { + this.errormsg = errormsg; + return this; + } + public BaseResponse setErrorcode(int errorcode) { + this.errorcode = errorcode; + return this; + } + public int getErrorcode() { + return errorcode; + } + + public Object getObject() { + return object; + } + + public void setObject(Object object) { + this.object = object; + } } \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java b/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java index 3c7ea01..435511d 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java @@ -13,6 +13,8 @@ public class PageResult extends BaseModel { private int size = 0; private Object grid; + + public PageResult(Integer count, Integer page, Integer limit, Object rows) { this.count = count; diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java index 54ecace..fed7171 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java @@ -14,8 +14,8 @@ public enum ResponseCode { COUPON_TEMP_NOT_FOUND(1006, "医院未绑定模板或无可生成的优惠券类型"), - COUPON_IS_CREATED(1007, "该用户已生成产检券"), - COUPON_NOT_AVAILABLE(1008, "使用的产检券类型不正确"), + COUPON_IS_CREATED(1007, "该用户已生成优惠券"), + COUPON_NOT_AVAILABLE(1008, "使用的优惠券类型不正确"), COUPON_AREA_NO_USE(1009, "该区域不能使用"), COUPON_NOT_FOUND(1001, "优惠券不存在"), diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 30a1de4..a62c427 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -884,10 +884,10 @@ public class DateUtil { * @return */ public static boolean isBetween(Date date, Date start, Date end) { - if(DateUtil.isGtOrEq(date, start) && DateUtil.isLtOrEq(date, end)) { - return true; - } - return false; + long startTime = start.getTime(); + long endTime = end.getTime(); + long time = date.getTime(); + return startTime < time && time < endTime ? true : false; } public static void main(String[] arg) throws Exception { @@ -897,5 +897,8 @@ public class DateUtil { System.out.println(isBetween(now, start, end)); System.out.println(org.apache.commons.lang3.time.DateUtils.addMonths(start ,1).toLocaleString()); + long startTime = 1483372800000l; + long endTime = end.getTime(); + System.out.println(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index f4ebc00..46017ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -16,10 +16,14 @@ import com.lyms.platform.operate.web.facade.AntExRecordFacade; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.permission.service.CouponService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +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 javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,6 +61,8 @@ public class AntenatalExaminationController extends BaseController { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private CouponService couponService; /** * * @return @@ -133,7 +139,19 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); + /** 验证产检券是否可用 可用就改为已使用状态 */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); + if(resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExAddRequest.getCouponCode(), getUserId(request)); + } + } + + BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(antExAddRequest.getCouponCode())); + return baseResponse; } /** @@ -147,7 +165,19 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId()); + /** 验证产检券是否可用 可用就改为已使用状态 */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(antExcAddRequest.getCouponCode()) && antExcAddRequest.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(antExcAddRequest.getCouponCode(), antExcAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); + if(resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExcAddRequest.getCouponCode(), getUserId(request)); + } + } + + BaseResponse baseResponse = antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(antExcAddRequest.getCouponCode())); + return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 5ca6fbf..131c9bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BabyGuideSmsequest; @@ -16,8 +17,11 @@ import com.lyms.platform.operate.web.request.BabyManageRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.result.QueryHospitalListRequest; import com.lyms.platform.operate.web.result.QueryHospitalListResult; +import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.pojo.BabyModel; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -40,6 +44,14 @@ public class BabyBuildController extends BaseController { @Autowired private BabyBookbuildingFacade babyBookbuildingFacade; + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private CouponService couponService; + + @Autowired + private MongoTemplate mongoTemplate; /** * 添加或者修改儿童建档 @@ -66,13 +78,17 @@ public class BabyBuildController extends BaseController { * @return */ @RequestMapping(value = "/deleteBabyBuildById/{id}", method = RequestMethod.DELETE) + @TokenRequired @ResponseBody - public BaseResponse deleteBabyBuildById(@PathVariable("id") String id) { + public BaseResponse deleteBabyBuildById(@PathVariable("id") String id, HttpServletRequest request) { + BabyModel babyModel = mongoTemplate.findById(id, BabyModel.class); + if(babyModel != null) { + couponService.del(getUserId(request) +"", autoMatchFacade.getHospitalId(getUserId(request)), babyModel.getPid()); + } return babyBookbuildingFacade.deleteBabyBuildById(id); } - /** * 查询儿童建档信息根据id查询 * @param id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index ca904fa..7250c4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -1,7 +1,6 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -9,8 +8,10 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BabyCheckFacade; import com.lyms.platform.operate.web.request.BabyCheckRequest; +import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,11 @@ public class BabyCheckController extends BaseController{ @Autowired private BabyCheckFacade babyCheckFacade; + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private CouponService couponService; /** @@ -41,11 +47,25 @@ public class BabyCheckController extends BaseController{ @TokenRequired public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request,HttpServletRequest httpServletRequest) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + /** 验证产检券是否可用 可用就改为已使用状态 */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getCouponCode()) && request.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(request.getCouponCode(), request.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); + if(resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), request.getCouponCode(), getUserId(httpServletRequest)); + } + } + if (request != null && !StringUtils.isEmpty(request.getId())) { - return babyCheckFacade.updateBabyCheck(request,loginState.getId()); + BaseResponse baseResponse = babyCheckFacade.updateBabyCheck(request, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(request.getCouponCode())); + return baseResponse; } - return babyCheckFacade.addBabyCheck(request,loginState.getId()); + BaseResponse baseResponse = babyCheckFacade.addBabyCheck(request, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(request.getCouponCode())); + return baseResponse; } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java index 4209f2d..a4a8691 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java @@ -6,11 +6,13 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.DischargeAbstractFacade; import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; import com.lyms.platform.operate.web.result.DischargeAbstractQueryResult; import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult; +import com.lyms.platform.permission.service.CouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; @@ -32,6 +34,12 @@ public class DischargeAbstractController extends BaseController { @Autowired private DischargeAbstractFacade dischargeAbstractFacade; + @Autowired + private CouponService couponService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * @auther HuJiaqi * @createTime 2016年12月05日 14时37分 @@ -42,18 +50,35 @@ public class DischargeAbstractController extends BaseController { @RequestMapping(value = "save", method = RequestMethod.POST, consumes = "application/json") public BaseObjectResponse save(HttpServletRequest httpServletRequest, @RequestBody DischargeAbstractSaveRequest dischargeAbstractSaveRequest) { BaseObjectResponse baseObjectResponse; + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + + /** 验证产检券是否可用 可用就改为已使用状态 */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); + if(resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), dischargeAbstractSaveRequest.getCouponCode(), getUserId(httpServletRequest)); + } + } + try { dischargeAbstractSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); DischargeAbstractSaveResult dischargeAbstractSaveResult = dischargeAbstractFacade.save(dischargeAbstractSaveRequest); if (dischargeAbstractSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg()); + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); return baseObjectResponse; } baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg()).setData(dischargeAbstractSaveResult); + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); } catch (Exception e) { baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); ExceptionUtils.catchException(e, "dischargeAbstract/save异常"); } + + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); return baseObjectResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java new file mode 100644 index 0000000..387b8e3 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -0,0 +1,53 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.permission.model.BabyPatientExtendEar; +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; +import com.lyms.platform.permission.service.BabyPatientExtendEarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; + +/** + * 儿童建档相关逻辑 + * @Author: litao + * @Date: 2017/5/10 0010 18:25 + * @Version: V1.0 + */ +@RequestMapping("/ear") +@Controller +public class EarController extends BaseController { + + @Autowired + private BabyPatientExtendEarService babyPatientExtendEarService; + + /** + * 添加儿童建档 + * @return + */ + @RequestMapping(method = RequestMethod.POST) + @ResponseBody + @TokenRequired + public BaseObjectResponse add(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, + BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, HttpServletRequest request) { + return babyPatientExtendEarService.insert(ear, earBirth, earMother, earFamily, getUserId(request)); + } + + /** + * 获取 添加儿童建档界面的 下拉列表数据 + * @return + */ + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse config() { + return babyPatientExtendEarService.getConfigs(); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 3783e80..6e761f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.ExcelUtil; @@ -19,6 +18,7 @@ import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel; import com.lyms.platform.operate.web.result.ChildbirthManagerResult; import com.lyms.platform.operate.web.result.NewBabyManagerQueryModel; import com.lyms.platform.operate.web.result.NewBabyManagerResult; +import com.lyms.platform.permission.service.CouponService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -40,6 +40,9 @@ public class MatDeliverController extends BaseController{ @Autowired private MatDeliverFacade matDeliverFacade; + @Autowired + private CouponService couponService; + /** * 查询分娩记录 * @@ -68,7 +71,9 @@ public class MatDeliverController extends BaseController{ @TokenRequired public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest,loginState.getId()); + BaseResponse baseResponse = matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode())); + return baseResponse; } /** * 删除一条删除记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index d41f02d..b3184b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -4,10 +4,13 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.PostReviewFacade; import com.lyms.platform.operate.web.request.PostReviewQueryRequest; import com.lyms.platform.operate.web.request.PostReviewRequest; +import com.lyms.platform.permission.service.CouponService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,6 +31,12 @@ public class PostReviewController extends BaseController { @Autowired private PostReviewFacade postReviewFacade; + @Autowired + private CouponService couponService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + @RequestMapping(method = RequestMethod.GET,value = "/cTime") @ResponseBody public long getCurrentTime(){ @@ -44,7 +53,19 @@ public class PostReviewController extends BaseController { @TokenRequired public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return postReviewFacade.addPostReview(postReviewRequest,loginState.getId()); + + /** 验证产检券是否可用 可用就改为已使用状态 */ + if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) { + BaseObjectResponse resp = couponService.validate(postReviewRequest.getCouponCode(), postReviewRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); + if(resp.getErrorcode() != 0) { + return resp; + } else { + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), postReviewRequest.getCouponCode(), getUserId(request)); + } + } + BaseResponse baseResponse = postReviewFacade.addPostReview(postReviewRequest, loginState.getId()); + baseResponse.setObject(couponService.getPatientsInfoByCode(postReviewRequest.getCouponCode())); + return baseResponse; } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index d56a185..7f61599 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -12,13 +12,16 @@ import com.lyms.platform.common.utils.MessageUtil; import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BookbuildingFacade; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.pojo.Patients; import org.apache.commons.httpclient.HttpClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -49,6 +52,12 @@ public class PregnantBuildController extends BaseController{ @Autowired private CouponService couponService; + @Autowired + private MongoTemplate mongoTemplate; + + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * 查询孕妇建档记录 @@ -69,11 +78,9 @@ public class PregnantBuildController extends BaseController{ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateYunBuild") @ResponseBody @TokenRequired - public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest, String code, HttpServletRequest request) { + public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - /** 验证产检券是否可用 可用就改为已使用状态 */ -// couponService.validate(loginState.getId(), ) if (yunBookbuildingAddRequest != null && !StringUtils.isEmpty(yunBookbuildingAddRequest.getId()) ) { return bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest,loginState.getId()); @@ -114,6 +121,10 @@ public class PregnantBuildController extends BaseController{ @TokenRequired public BaseResponse deletePregnantById(@PathVariable("id")String id,HttpServletRequest httpServletRequest){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + Patients patients = mongoTemplate.findById(id, Patients.class); + if(patients != null) { + couponService.del(getUserId(httpServletRequest) +"", autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), patients.getPid()); + } return bookbuildingFacade.deletePregnantById(id,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index f70590f..3d2922c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -5,7 +5,6 @@ import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.AntenatalExaminationModel; -import org.codehaus.jackson.annotate.JsonIgnore; import org.hibernate.validator.constraints.NotEmpty; import java.util.List; @@ -87,6 +86,26 @@ public class AntExAddRequest implements IBasicRequestConvert { //人工流产 private Integer abortionRG; + private String couponCode; + + private Integer couponType; + + public String getCouponCode() { + return couponCode; + } + + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; + } + + public Integer getCouponType() { + return couponType; + } + + public void setCouponType(Integer couponType) { + this.couponType = couponType; + } + public String getBarCode() { return barCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 9cf8fb4..36b9eb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -239,6 +239,26 @@ public class BabyCheckRequest { private String monthAge; + private String couponCode; + + private Integer couponType; + + public String getCouponCode() { + return couponCode; + } + + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; + } + + public Integer getCouponType() { + return couponType; + } + + public void setCouponType(Integer couponType) { + this.couponType = couponType; + } + public String getWeightEvaluate() { return weightEvaluate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java index 550d5f8..defcf29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java @@ -23,6 +23,8 @@ public class DischargeAbstractQueryRequest { private Integer operatorId; + private String coupon; + public Integer getOperatorId() { return operatorId; } @@ -46,4 +48,12 @@ public class DischargeAbstractQueryRequest { public void setVcCardNo(String vcCardNo) { this.vcCardNo = vcCardNo; } + + public String getCoupon() { + return coupon; + } + + public void setCoupon(String coupon) { + this.coupon = coupon; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index 486af8a..e823613 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -57,6 +57,26 @@ public class DischargeAbstractSaveRequest { private String pId; + private String couponCode; + + private Integer couponType; + + public String getCouponCode() { + return couponCode; + } + + public void setCouponCode(String couponCode) { + this.couponCode = couponCode; + } + + public Integer getCouponType() { + return couponType; + } + + public void setCouponType(Integer couponType) { + this.couponType = couponType; + } + public static class Baby { /** @@ -180,6 +200,8 @@ public class DischargeAbstractSaveRequest { */ private String orderScreenDescription; + + public String getpId() { return pId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 6e9df6d..d5ca576 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -3,17 +3,11 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.enums.SexTypeEnums; -import com.lyms.platform.common.enums.VisitStatusEnums; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.MaternalDeliverModel; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; @@ -87,6 +81,26 @@ public class MatDeliverAddRequest implements IBasicRequestConvert> maps = new ArrayList<>(); + + /** 用于存储 parent key 相同的数据 */ + private List>> parentMaps = new ArrayList<>(); + + + /** + * 初始平台缓存信息 + */ + @PostConstruct + public void initCache() { + List configs = mongoTemplate.findAll(BasicConfig.class); + + } + + /** + * 删除平台缓存信息 + */ + public void deleteCache() { + + } + +}