diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICancerScreeningDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICancerScreeningDao.java new file mode 100644 index 0000000..5b4cfff --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ICancerScreeningDao.java @@ -0,0 +1,59 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.CancerScreeningModel; + +import java.util.List; + +/** + * 两癌筛查 + * Created by Administrator on 2016/6/21 0021. + */ +public interface ICancerScreeningDao { + + /** + * 增加一条两癌筛查记录 + * + * @param cancerScreeningChuModel + * @return + */ + CancerScreeningModel addOneCanScr(CancerScreeningModel cancerScreeningChuModel); + + /** + * 根据id获取详细的两癌筛查记录 + * + * @return + */ + CancerScreeningModel findOneById(String id); + + /** + * 修改查询到的两癌筛查记录 + * + * @param mongoQuery + */ + void updateOneCanScr(MongoQuery mongoQuery, CancerScreeningModel cancerScreeningChuModel); + + /** + * 修改一条两癌筛查 + * + * @param cancerScreeningChuModel + * @param id + */ + void updateOneCanScr(CancerScreeningModel cancerScreeningChuModel, String id); + + /** + * + * 查询列表 + * @param query + * @return + */ + List query(MongoQuery query); + + /** + * 查询数据 + * + * @param query + * @return + */ + int count(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CancerScreeningDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CancerScreeningDaoImpl.java new file mode 100644 index 0000000..eae26a2 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CancerScreeningDaoImpl.java @@ -0,0 +1,89 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.ICancerScreeningDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.CancerScreeningModel; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +/** + * @auther yangfei + * @createTime 2018年04月11日 16时46分 + * @discription + */ +@Repository +public class CancerScreeningDaoImpl extends BaseMongoDAOImpl implements ICancerScreeningDao { + /** + * 增加一条两癌筛查记录 + * + * @param cancerScreeningChuModel + * @return + */ + @Override + public CancerScreeningModel addOneCanScr(CancerScreeningModel cancerScreeningChuModel) { + + return save(cancerScreeningChuModel); + } + + /** + * 根据id获取详细的两癌筛查记录 + * + * @param id + * @return + */ + @Override + public CancerScreeningModel findOneById(String id) { + + return findById(id); + } + + /** + * 修改查询到的两癌筛查记录 + * + * @param mongoQuery + * @param cancerScreeningChuModel + */ + @Override + public void updateOneCanScr(MongoQuery mongoQuery, CancerScreeningModel cancerScreeningChuModel) { + cancerScreeningChuModel.setModified(new Date()); + updateMulti(mongoQuery.convertToMongoQuery(), cancerScreeningChuModel); + } + + /** + * 修改一条两癌筛查 + * + * @param cancerScreeningChuModel + * @param id + */ + @Override + public void updateOneCanScr(CancerScreeningModel cancerScreeningChuModel, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), cancerScreeningChuModel); + } + + /** + * 查询列表 + * + * @param query + * @return + */ + @Override + public List query(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + /** + * 查询数据 + * + * @param query + * @return + */ + @Override + public int count(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CancerScreeningService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CancerScreeningService.java new file mode 100644 index 0000000..3049e5e --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CancerScreeningService.java @@ -0,0 +1,80 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.ICancerScreeningDao; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.pojo.CancerScreeningModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.Date; +import java.util.List; + +/** + * 产前检查服务实现 + * + */ +@Service +public class CancerScreeningService { + @Autowired + private ICancerScreeningDao iCancerScreeningDao; + + public List findAllByResidentId(String residentId) { + Assert.notNull(residentId, "findAllByParentId residentId must not be null."); + MongoCondition condition = MongoCondition.newInstance("residentId", residentId, MongoOper.IS).and("yn", YnEnums.YES.getId(), MongoOper.IS); + return iCancerScreeningDao.query(condition.toMongoQuery().addOrder(Sort.Direction.DESC, "created")); + } + + /** + * 查询条数 + * + * @param query + * @return + */ + public int queryCancerScreCount(MongoQuery query) { + return iCancerScreeningDao.count(query); + } + + + /** + * 根据id查询两癌筛查 + * + * @param id 两癌筛查id + * @return 两癌筛查 + */ + public CancerScreeningModel findOneById(String id) { + Assert.notNull(id, "findOneById id must not be null."); + return iCancerScreeningDao.findOneById(id); + } + + /** + * 增加一条两癌筛查记录 + * + * @param babyVisitModel 两癌筛查记录模型 + * @return + */ + public CancerScreeningModel addOneCancerScreen(CancerScreeningModel babyVisitModel) { + Assert.notNull(babyVisitModel, "addOneBabyAnt babyVisitModel must not be null."); + babyVisitModel.setCreated(new Date()); + babyVisitModel.setModified(new Date()); + + return iCancerScreeningDao.addOneCanScr(babyVisitModel); + } + + /** + * 修改一条两癌筛查记录 + * + * @param babyVisitModel 两癌筛查记录模型 + * @param id 两癌筛查id + */ + public void updateOneCancerScreen(CancerScreeningModel babyVisitModel, String id) { + Assert.notNull(id, "updateOneAnt id must not be null."); + babyVisitModel.setModified(new Date()); + iCancerScreeningDao.updateOneCanScr(babyVisitModel, id); + } + +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java new file mode 100644 index 0000000..d08506c --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -0,0 +1,691 @@ +package com.lyms.platform.pojo; + +/** + * @auther yangfei + * @createTime 2018年04月11日 16时17分 + * @discription + */ + +import com.lyms.platform.beans.SerialIdEnum; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 两癌筛查 + */ +@Document(collection = "lyms_cancer_screen") +public class CancerScreeningModel { + private static final long serialVersionUID = SerialIdEnum.CancerScreeningModel.getCid(); + //妇女id + private String residentId; + //(一）病史情况 + //月经情况 + //月经初潮年龄(岁) + private String bsYjage; + //最近一次末次月经 + private String bsZjyj; + //绝经(1.否2.是3.不确定) + private String bsJj; + //绝经年龄(岁) + private String bsJjage; + //孕产史 + //孕次(次) + private String ycYc; + //产次(次) + private String ycCc; + //初产年龄(岁) + private String ycAge; + //哺乳史 + private String ycFrs; + //是否接受过乳腺癌检査 + private String ycRxajc; + //既往史 + //乳腺手术或活检史 + private String jwsRxss; + //激素替代治疗史 + private String jwsJstd; + //家族史病史 + //乳腺癌 + private String jzsRxa; + //卵巢癌 + private String jzsLca; + //(二）乳腺临床检査 + //皮肤左 + private String rxlPfz; + //皮肤右 + private String rxlPfy; + //乳头左 + private String rxlRtz; + //乳头右 + private String rxlRty; + //溢液左 + private String rxlYyz; + //溢液右 + private String rxlYyy; + //肿块左 + private String rxlZkz; + //肿块右 + private String rxlZky; + //大小左 + private String rxlDxz; + //大小右 + private String rxlDxy; + //形状左 + private String rxlXzz; + //形状右 + private String rxlXzy; + //硬度左 + private String rxlYdz; + //硬度右 + private String rxlYdy; + //边缘左 + private String rxlByz; + //边缘右 + private String rxlByy; + //表面左 + private String rxlBmz; + //表面右 + private String rxlBmy; + //活动度左 + private String rxlHddz; + //活动度右 + private String rxlHddy; + //副乳1.无2.有 + private String rxlFr; + //腋淋巴结左 + private String rxlYlbz; + //腋淋巴结右 + private String rxlYlby; + //锁骨上淋巴结左 + private String rxlSglbz; + //锁骨上淋巴结右 + private String rxlSglby; + //临床检査结果 + private String rxlJcjg; + //(三）乳腺彩色超声检査 + //超声所见 + private String rxCssj; + //分类左 + private String rxFlz; + //分类右 + private String rxlFly; + //建议 + private String rxlJy; + //检查机构 + private String rxlJcdw; + //检査人员 + private String rxlJcry; + //检査日期 + private String rxlJcrq; + //(四〉乳腺X线检査（未作X线检査不填写此项） + //乳腺X线评估左 + private String rxPgz; + //乳腺X线评估右 + private String rxlPgy; + //建议 + private String rxJy; + //(五〉最终随访结果 + //随访情况 + private String sfQk; + //病理检査 + private String sfBljc; + //病理检査机构 + private String sfBljg; + //病理诊断者 + private String sfBlzd; + //病理检査日期 + private String sfJcrq; + //最后诊断 + private String sfZhzd; + //TNM分期 + private String sfTnm; + //诊治机构 + private String sfZzjg; + //诊治日期 + private String sfZlrq; + //接受治疗情况 + private String sfJszl; + //检査机构 + private String sfJcjg; + //检查人员 + private String sfJcry; + //检査日期 + private String sfJcsj; + private Date modified; + private Date created; + //操作人 + private Integer operator; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getResidentId() { + return residentId; + } + + public void setResidentId(String residentId) { + this.residentId = residentId; + } + + public String getBsYjage() { + return bsYjage; + } + + public void setBsYjage(String bsYjage) { + this.bsYjage = bsYjage; + } + + public String getBsZjyj() { + return bsZjyj; + } + + public void setBsZjyj(String bsZjyj) { + this.bsZjyj = bsZjyj; + } + + public String getBsJj() { + return bsJj; + } + + public void setBsJj(String bsJj) { + this.bsJj = bsJj; + } + + public String getBsJjage() { + return bsJjage; + } + + public void setBsJjage(String bsJjage) { + this.bsJjage = bsJjage; + } + + public String getYcYc() { + return ycYc; + } + + public void setYcYc(String ycYc) { + this.ycYc = ycYc; + } + + public String getYcCc() { + return ycCc; + } + + public void setYcCc(String ycCc) { + this.ycCc = ycCc; + } + + public String getYcAge() { + return ycAge; + } + + public void setYcAge(String ycAge) { + this.ycAge = ycAge; + } + + public String getYcFrs() { + return ycFrs; + } + + public void setYcFrs(String ycFrs) { + this.ycFrs = ycFrs; + } + + public String getYcRxajc() { + return ycRxajc; + } + + public void setYcRxajc(String ycRxajc) { + this.ycRxajc = ycRxajc; + } + + public String getJwsRxss() { + return jwsRxss; + } + + public void setJwsRxss(String jwsRxss) { + this.jwsRxss = jwsRxss; + } + + public String getJwsJstd() { + return jwsJstd; + } + + public void setJwsJstd(String jwsJstd) { + this.jwsJstd = jwsJstd; + } + + public String getJzsRxa() { + return jzsRxa; + } + + public void setJzsRxa(String jzsRxa) { + this.jzsRxa = jzsRxa; + } + + public String getJzsLca() { + return jzsLca; + } + + public void setJzsLca(String jzsLca) { + this.jzsLca = jzsLca; + } + + public String getRxlPfz() { + return rxlPfz; + } + + public void setRxlPfz(String rxlPfz) { + this.rxlPfz = rxlPfz; + } + + public String getRxlPfy() { + return rxlPfy; + } + + public void setRxlPfy(String rxlPfy) { + this.rxlPfy = rxlPfy; + } + + public String getRxlRtz() { + return rxlRtz; + } + + public void setRxlRtz(String rxlRtz) { + this.rxlRtz = rxlRtz; + } + + public String getRxlRty() { + return rxlRty; + } + + public void setRxlRty(String rxlRty) { + this.rxlRty = rxlRty; + } + + public String getRxlYyz() { + return rxlYyz; + } + + public void setRxlYyz(String rxlYyz) { + this.rxlYyz = rxlYyz; + } + + public String getRxlYyy() { + return rxlYyy; + } + + public void setRxlYyy(String rxlYyy) { + this.rxlYyy = rxlYyy; + } + + public String getRxlZkz() { + return rxlZkz; + } + + public void setRxlZkz(String rxlZkz) { + this.rxlZkz = rxlZkz; + } + + public String getRxlZky() { + return rxlZky; + } + + public void setRxlZky(String rxlZky) { + this.rxlZky = rxlZky; + } + + public String getRxlDxz() { + return rxlDxz; + } + + public void setRxlDxz(String rxlDxz) { + this.rxlDxz = rxlDxz; + } + + public String getRxlDxy() { + return rxlDxy; + } + + public void setRxlDxy(String rxlDxy) { + this.rxlDxy = rxlDxy; + } + + public String getRxlXzz() { + return rxlXzz; + } + + public void setRxlXzz(String rxlXzz) { + this.rxlXzz = rxlXzz; + } + + public String getRxlXzy() { + return rxlXzy; + } + + public void setRxlXzy(String rxlXzy) { + this.rxlXzy = rxlXzy; + } + + public String getRxlYdz() { + return rxlYdz; + } + + public void setRxlYdz(String rxlYdz) { + this.rxlYdz = rxlYdz; + } + + public String getRxlYdy() { + return rxlYdy; + } + + public void setRxlYdy(String rxlYdy) { + this.rxlYdy = rxlYdy; + } + + public String getRxlByz() { + return rxlByz; + } + + public void setRxlByz(String rxlByz) { + this.rxlByz = rxlByz; + } + + public String getRxlByy() { + return rxlByy; + } + + public void setRxlByy(String rxlByy) { + this.rxlByy = rxlByy; + } + + public String getRxlBmz() { + return rxlBmz; + } + + public void setRxlBmz(String rxlBmz) { + this.rxlBmz = rxlBmz; + } + + public String getRxlBmy() { + return rxlBmy; + } + + public void setRxlBmy(String rxlBmy) { + this.rxlBmy = rxlBmy; + } + + public String getRxlHddz() { + return rxlHddz; + } + + public void setRxlHddz(String rxlHddz) { + this.rxlHddz = rxlHddz; + } + + public String getRxlHddy() { + return rxlHddy; + } + + public void setRxlHddy(String rxlHddy) { + this.rxlHddy = rxlHddy; + } + + public String getRxlFr() { + return rxlFr; + } + + public void setRxlFr(String rxlFr) { + this.rxlFr = rxlFr; + } + + public String getRxlYlbz() { + return rxlYlbz; + } + + public void setRxlYlbz(String rxlYlbz) { + this.rxlYlbz = rxlYlbz; + } + + public String getRxlYlby() { + return rxlYlby; + } + + public void setRxlYlby(String rxlYlby) { + this.rxlYlby = rxlYlby; + } + + public String getRxlSglbz() { + return rxlSglbz; + } + + public void setRxlSglbz(String rxlSglbz) { + this.rxlSglbz = rxlSglbz; + } + + public String getRxlSglby() { + return rxlSglby; + } + + public void setRxlSglby(String rxlSglby) { + this.rxlSglby = rxlSglby; + } + + public String getRxlJcjg() { + return rxlJcjg; + } + + public void setRxlJcjg(String rxlJcjg) { + this.rxlJcjg = rxlJcjg; + } + + public String getRxCssj() { + return rxCssj; + } + + public void setRxCssj(String rxCssj) { + this.rxCssj = rxCssj; + } + + public String getRxFlz() { + return rxFlz; + } + + public void setRxFlz(String rxFlz) { + this.rxFlz = rxFlz; + } + + public String getRxlFly() { + return rxlFly; + } + + public void setRxlFly(String rxlFly) { + this.rxlFly = rxlFly; + } + + public String getRxlJy() { + return rxlJy; + } + + public void setRxlJy(String rxlJy) { + this.rxlJy = rxlJy; + } + + public String getRxlJcdw() { + return rxlJcdw; + } + + public void setRxlJcdw(String rxlJcdw) { + this.rxlJcdw = rxlJcdw; + } + + public String getRxlJcry() { + return rxlJcry; + } + + public void setRxlJcry(String rxlJcry) { + this.rxlJcry = rxlJcry; + } + + public String getRxlJcrq() { + return rxlJcrq; + } + + public void setRxlJcrq(String rxlJcrq) { + this.rxlJcrq = rxlJcrq; + } + + public String getRxPgz() { + return rxPgz; + } + + public void setRxPgz(String rxPgz) { + this.rxPgz = rxPgz; + } + + public String getRxlPgy() { + return rxlPgy; + } + + public void setRxlPgy(String rxlPgy) { + this.rxlPgy = rxlPgy; + } + + public String getRxJy() { + return rxJy; + } + + public void setRxJy(String rxJy) { + this.rxJy = rxJy; + } + + public String getSfQk() { + return sfQk; + } + + public void setSfQk(String sfQk) { + this.sfQk = sfQk; + } + + public String getSfBljc() { + return sfBljc; + } + + public void setSfBljc(String sfBljc) { + this.sfBljc = sfBljc; + } + + public String getSfBljg() { + return sfBljg; + } + + public void setSfBljg(String sfBljg) { + this.sfBljg = sfBljg; + } + + public String getSfBlzd() { + return sfBlzd; + } + + public void setSfBlzd(String sfBlzd) { + this.sfBlzd = sfBlzd; + } + + public String getSfJcrq() { + return sfJcrq; + } + + public void setSfJcrq(String sfJcrq) { + this.sfJcrq = sfJcrq; + } + + public String getSfZhzd() { + return sfZhzd; + } + + public void setSfZhzd(String sfZhzd) { + this.sfZhzd = sfZhzd; + } + + public String getSfTnm() { + return sfTnm; + } + + public void setSfTnm(String sfTnm) { + this.sfTnm = sfTnm; + } + + public String getSfZzjg() { + return sfZzjg; + } + + public void setSfZzjg(String sfZzjg) { + this.sfZzjg = sfZzjg; + } + + public String getSfZlrq() { + return sfZlrq; + } + + public void setSfZlrq(String sfZlrq) { + this.sfZlrq = sfZlrq; + } + + public String getSfJszl() { + return sfJszl; + } + + public void setSfJszl(String sfJszl) { + this.sfJszl = sfJszl; + } + + public String getSfJcjg() { + return sfJcjg; + } + + public void setSfJcjg(String sfJcjg) { + this.sfJcjg = sfJcjg; + } + + public String getSfJcry() { + return sfJcry; + } + + public void setSfJcry(String sfJcry) { + this.sfJcry = sfJcry; + } + + public String getSfJcsj() { + return sfJcsj; + } + + public void setSfJcsj(String sfJcsj) { + this.sfJcsj = sfJcsj; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Integer getOperator() { + return operator; + } + + public void setOperator(Integer operator) { + this.operator = operator; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java new file mode 100644 index 0000000..d199fae --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -0,0 +1,161 @@ +package com.lyms.platform.query; + +/** + * @auther yangfei + * @createTime 2018年04月11日 16时17分 + * @discription + */ + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoQuery; + +/** + * 两癌筛查 + */ +public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQuery { + //(一）病史情况 + //月经情况 + //月经初潮年龄(岁) + public String bsYjage; + //最近一次末次月经 + public String bsZjyj; + //绝经(1.否2.是3.不确定) + public String bsJj; + //绝经年龄(岁) + public String bsJjage; + //孕产史 + //孕次(次) + public String ycYc; + //产次(次) + public String ycCc; + //初产年龄(岁) + public String ycAge; + //哺乳史 + public String ycFrs; + //是否接受过乳腺癌检査 + public String ycRxajc; + //既往史 + //乳腺手术或活检史 + public String jwsRxss; + //激素替代治疗史 + public String jwsJstd; + //家族史病史 + //乳腺癌 + public String jzsRxa; + //卵巢癌 + public String jzsLca; + //(二）乳腺临床检査 + //皮肤左 + public String rxlPfz; + //皮肤右 + public String rxlPfy; + //乳头左 + public String rxlRtz; + //乳头右 + public String rxlRty; + //溢液左 + public String rxlYyz; + //溢液右 + public String rxlYyy; + //肿块左 + public String rxlZkz; + //肿块右 + public String rxlZky; + //大小左 + public String rxlDxz; + //大小右 + public String rxlDxy; + //形状左 + public String rxlXzz; + //形状右 + public String rxlXzy; + //硬度左 + public String rxlYdz; + //硬度右 + public String rxlYdy; + //边缘左 + public String rxlByz; + //边缘右 + public String rxlByy; + //表面左 + public String rxlBmz; + //表面右 + public String rxlBmy; + //活动度左 + public String rxlHddz; + //活动度右 + public String rxlHddy; + //副乳1.无2.有 + public String rxlFr; + //腋淋巴结左 + public String rxlYlbz; + //腋淋巴结右 + public String rxlYlby; + //锁骨上淋巴结左 + public String rxlSglbz; + //锁骨上淋巴结右 + public String rxlSglby; + //临床检査结果 + public String rxlJcjg; + //(三）乳腺彩色超声检査 + //超声所见 + public String rxCssj; + //分类左 + public String rxFlz; + //分类右 + public String rxlFly; + //建议 + public String rxlJy; + //检查机构 + public String rxlJcdw; + //检査人员 + public String rxlJcry; + //检査日期 + public String rxlJcrq; + //(四〉乳腺X线检査（未作X线检査不填写此项） + //乳腺X线评估左 + public String rxPgz; + //乳腺X线评估右 + public String rxlPgy; + //建议 + public String rxJy; + //(五〉最终随访结果 + //随访情况 + public String sfQk; + //病理检査 + public String sfBljc; + //病理检査机构 + public String sfBljg; + //病理诊断者 + public String sfBlzd; + //病理检査日期 + public String sfJcrq; + //最后诊断 + public String sfZhzd; + //TNM分期 + public String sfTnm; + //诊治机构 + public String sfZzjg; + //诊治日期 + public String sfZlrq; + //接受治疗情况 + public String sfJszl; + //检査机构 + public String sfJcjg; + //检查人员 + public String sfJcry; + //检査日期 + public String sfJcsj; + + /** + * @return + */ + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + return condition.toMongoQuery(); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java new file mode 100644 index 0000000..f18ab4c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -0,0 +1,74 @@ +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.BaseResponse; +import com.lyms.platform.operate.web.service.IBloodSugarService; +import com.lyms.platform.pojo.BloodSugar; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +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 java.util.Date; + +/** + * 两癌筛查 + */ +@Controller +@RequestMapping("/cancerScr") +public class CancerScreeningController extends BaseController { + + + @Autowired + private IBloodSugarService bloodSugarService; + + @ResponseBody + @RequestMapping(value = "/init", method = RequestMethod.GET) + public BaseResponse init() { + return bloodSugarService.init(); + } + + @ResponseBody + @RequestMapping(method = RequestMethod.POST) + @TokenRequired + public BaseResponse add(BloodSugar bloodSugar, HttpServletRequest request) { + return bloodSugarService.add(getUserId(request), bloodSugar); + } + + @ResponseBody + @RequestMapping(value = "/wx", method = RequestMethod.POST) + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag) { + return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType, flag); + } + + @ResponseBody + @RequestMapping(method = RequestMethod.GET) + @TokenRequired + public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { + return bloodSugarService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); + } + + @ResponseBody + @RequestMapping(value = "/{parentId}/{type}/{time}", method = RequestMethod.GET) + @TokenRequired + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer type, @PathVariable Date time) { + return bloodSugarService.info(parentId, type, time); + } + + + @ResponseBody + @RequestMapping(value = "/wx/{parentId}/{type}", method = RequestMethod.GET) + public BaseResponse wxInfo(@PathVariable String parentId, @PathVariable Integer type) { + return bloodSugarService.wxInfo(parentId, type); + } + + @ResponseBody + @RequestMapping(value = "/app/{parentId}", method = RequestMethod.GET) + public BaseResponse getAppInfo(@PathVariable String parentId) { + return bloodSugarService.getAppInfo(parentId); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 1190f1d..6bcb699 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1373,6 +1373,7 @@ public class AntenatalExaminationFacade { while (iterator.hasNext()) { List listData = new ArrayList(); Patients patients = iterator.next(); + Patients patients2 = null; //建档记录 if (null != patients.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); @@ -1384,6 +1385,13 @@ public class AntenatalExaminationFacade { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); } + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setSource(patients.getId()); + patientsQuery.setBuildType(1); + List patients1 = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patients1)) { + patients2 = patients1.get(0); + } //初诊记录 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); @@ -1393,7 +1401,11 @@ public class AntenatalExaminationFacade { } else { antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); } - antExChuQuery.setParentId(patientId); + if (patients2!=null) { + antExChuQuery.setParentId(patients2.getId()); + } else { + antExChuQuery.setParentId(patientId); + } List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { for (AntExChuModel an : antExChuModels) { @@ -1407,13 +1419,18 @@ public class AntenatalExaminationFacade { //复诊记录 AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setParentId(patientId); antExQuery.setStart(patients.getBookbuildingDate()); if (null == patients.getFmDate()) { antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); } else { antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); } + if (patients2!=null) { + antExQuery.setParentId(patients2.getId()); + } else { + antExQuery.setParentId(patientId); + } + List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { @@ -1429,12 +1446,7 @@ public class AntenatalExaminationFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setSource(patients.getId()); - patientsQuery.setBuildType(1); - List patients1 = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(patients1)) { - Patients patients2 = patients1.get(0); + if (patients2!=null) { matDeliverQuery.setParentId(patients2.getId()); } else { matDeliverQuery.setParentId(patientId); @@ -1449,8 +1461,13 @@ public class AntenatalExaminationFacade { } //出院小结 DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); - dischargeAbstractMotherQuery.setPatientId(patientId); dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); + if (patients2!=null) { + dischargeAbstractMotherQuery.setPatientId(patients2.getId()); + } else { + dischargeAbstractMotherQuery.setPatientId(patientId); + } + List dischargeAbstractMotherModels = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) { @@ -1463,7 +1480,11 @@ public class AntenatalExaminationFacade { if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { StopPregQuery stopPregQuery = new StopPregQuery(); stopPregQuery.setYn(YnEnums.YES.getId()); - stopPregQuery.setPatientId(patientId); + if (patients2!=null) { + stopPregQuery.setPatientId(patients2.getId()); + } else { + stopPregQuery.setPatientId(patientId); + } List models = stopPregnancyService.queryStopPreg(stopPregQuery); if (CollectionUtils.isNotEmpty(models)) { for (StopPregModel stop : models) { @@ -1476,8 +1497,11 @@ public class AntenatalExaminationFacade { } else { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setYn(YnEnums.YES.getId()); - postReviewQuery.setParentId(patientId); - + if (patients2!=null) { + postReviewQuery.setParentId(patients2.getId()); + } else { + postReviewQuery.setParentId(patientId); + } //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { diff --git a/platform-operate-api/src/main/webapp/WEB-INF/web.xml b/platform-operate-api/src/main/webapp/WEB-INF/web.xml index 4c72fca..1ec34a6 100644 --- a/platform-operate-api/src/main/webapp/WEB-INF/web.xml +++ b/platform-operate-api/src/main/webapp/WEB-INF/web.xml @@ -13,42 +13,41 @@ version="2.5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - + + CorsFilter + org.apache.catalina.filters.CorsFilter + + cors.allowed.origins + * + + + cors.allowed.methods + GET,POST,HEAD,OPTIONS,PUT,DELETE + + + cors.allowed.headers + Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,authorization + + + cors.exposed.headers + Access-Control-Allow-Origin,Access-Control-Allow-Credentials + + + cors.support.credentials + true + + + cors.preflight.maxage + 10 + + + + CorsFilter + /* + + + default