diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java index ce2638c..bc6355b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java @@ -4,6 +4,8 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.pojo.SieveResultModel; +import java.util.List; + /** * Created by Administrator on 2016/6/30 0030. */ @@ -44,5 +46,12 @@ public interface ISieveDao { */ void addChanQianSieve(SieveModel sieveModel); + /** + * 查询产筛列表 + * + * @param sieveQuery + * @return + */ + List queryList(MongoQuery sieveQuery); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java index 8dbab27..cfac3b4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java @@ -13,6 +13,8 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import org.springframework.util.Assert; +import java.util.List; + /** * Created by Administrator on 2016/6/30 0030. */ @@ -46,8 +48,14 @@ public class SieveDaoImpl extends BaseMongoDAOImpl implements Assert.notNull(update, "execute update method must not null."); mongoTemplate.updateMulti(new MongoQuery(new MongoCondition("id", sieveModel.getId(), MongoOper.IS)).convertToMongoQuery(), update, SieveModel.class); } - public void addChanQianSieve(SieveModel sieveModel){ + + public void addChanQianSieve(SieveModel sieveModel) { Assert.notNull(sieveModel, "execute insert method must not null."); mongoTemplate.insert(sieveModel); } + + public List queryList(MongoQuery sieveQuery) { + Assert.notNull(sieveQuery, "execute find method query must not null."); + return mongoTemplate.find(sieveQuery.convertToMongoQuery(), SieveModel.class); + } } \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index d925a67..c4b7faa 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -4,10 +4,13 @@ import com.lyms.platform.biz.dal.ISieveDao; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.pojo.SieveResultModel; +import com.lyms.platform.query.SieveQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/6/30 0030. @@ -18,26 +21,31 @@ public class SieveService { @Autowired private ISieveDao iSieveDao; - public SieveResultModel addSieve(SieveResultModel obj){ + public SieveResultModel addSieve(SieveResultModel obj) { obj.setModified(new Date()); obj.setCreated(new Date()); obj.setYn(YnEnums.YES.getId()); return iSieveDao.addSieveResult(obj); } - public SieveResultModel findById(String id){ - return iSieveDao.findById(id); + public SieveResultModel findById(String id) { + return iSieveDao.findById(id); } - public void updateOneChanQianDiaSieve(SieveModel sieveModel){ + public void updateOneChanQianDiaSieve(SieveModel sieveModel) { sieveModel.setModified(new Date()); iSieveDao.updateChanQianSieve(sieveModel); } - public void addChanQianSieve(SieveModel sieveModel){ + + public void addChanQianSieve(SieveModel sieveModel) { sieveModel.setModified(new Date()); sieveModel.setCreated(new Date()); sieveModel.setYn(YnEnums.YES.getId()); iSieveDao.addChanQianSieve(sieveModel); } + + public List queryList(SieveQuery sieveQuery) { + return iSieveDao.queryList(sieveQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + } } \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java index c3d6d47..d2549f6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java @@ -65,5 +65,13 @@ public enum ChanQResultEnums { public void setName(String name) { this.name = name; } + public static String getTitle(Integer id){ + for(CqResult enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return null; + } } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJuEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJuEnums.java index cfb5aa8..aaecabe 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJuEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/RenShenJieJuEnums.java @@ -4,21 +4,21 @@ package com.lyms.platform.common.enums; * Created by Administrator on 2016/6/24 0024. */ public enum RenShenJieJuEnums { - O("活产", "0"),O1("死胎", "1"),O2("噙软胎", "2"); + O("活产", 0),O1("死胎", 1),O2("噙软胎", 2); - private RenShenJieJuEnums(String name, String id) { + private RenShenJieJuEnums(String name, Integer id) { this.name = name; this.id = id; } private String name; - private String id; + private Integer id; - public String getId() { + public Integer getId() { return id; } - public void setId(String id) { + public void setId(Integer id) { this.id = id; } @@ -29,4 +29,12 @@ public enum RenShenJieJuEnums { public void setName(String name) { this.name = name; } + public static String getTitle(Integer id){ + for(RenShenJieJuEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return null; + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java index a9ed074..c89ff54 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java @@ -31,4 +31,12 @@ public enum SieveEnums { public void setName(String name) { this.name = name; } + public static String getTitle(Integer id){ + for(SieveEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return null; + } } \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java index ef3e4f2..315d71e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TaiPanEnums.java @@ -12,6 +12,15 @@ public enum TaiPanEnums { O4("五胎","5"), O5("六胎","6"), O6("七胎","7"); + + public static String getTitle(String id){ + for(TaiPanEnums enums:values()){ + if(id==enums.getId()){ + return enums.getName(); + } + } + return null; + } public enum TpEnums { O("完整","1"),O1("不完整","2"); private TpEnums(String name,String id){ diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 422d162..5b79ca6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -31,9 +31,11 @@ public class SieveModel extends BaseModel { //产前诊断 1 已检查 0 未检查 private Integer cqStatus; //产前诊断结果 - private String cqResult; + private Integer cqResult; //妊娠结局 - private String renShenResult; + private Integer renShenResult; + //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 + private Integer status; // 诊断时间 private String diaTime; @@ -54,14 +56,30 @@ public class SieveModel extends BaseModel { this.yn = yn; } - public String getCqResult() { + public Integer getRenShenResult() { + return renShenResult; + } + + public Integer getCqResult() { return cqResult; } - public void setCqResult(String cqResult) { + public void setCqResult(Integer cqResult) { this.cqResult = cqResult; } + public void setRenShenResult(Integer renShenResult) { + this.renShenResult = renShenResult; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Integer getCqStatus() { return cqStatus; } @@ -158,13 +176,7 @@ public class SieveModel extends BaseModel { this.publishName = publishName; } - public String getRenShenResult() { - return renShenResult; - } - public void setRenShenResult(String renShenResult) { - this.renShenResult = renShenResult; - } public Integer getTireNumber() { return tireNumber; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java new file mode 100644 index 0000000..9a744a0 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -0,0 +1,216 @@ +package com.lyms.platform.query; + +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.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; + +import java.util.Date; + +/** + * + * 产前筛查 + * + * Created by Administrator on 2016/7/5 0005. + */ +public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { + + private String id; + //患者id + private String parentId; + //姓名 + private String name; + //胎数 + private Integer tireNumber; + //整体风险 + private Integer ztfx; + //联系方式 + private String phone; + //申请孕周 + private String dueWeek; + //产前诊断 1 已检查 0 未检查 + private Integer cqStatus; + //产前诊断结果 + private Integer cqResult; + //妊娠结局 + private Integer renShenResult; + //状态 + private Integer status; + private String cardNo; + + private Integer yn; + + //孕周开始 + private Date dueWeekStart; + //孕周结束 + private Date dueWeekEnd; + + //是否通知 + private Integer isNotify; + + public Integer getIsNotify() { + return isNotify; + } + + public void setIsNotify(Integer isNotify) { + this.isNotify = isNotify; + } + + public Date getDueWeekEnd() { + return dueWeekEnd; + } + + public void setDueWeekEnd(Date dueWeekEnd) { + this.dueWeekEnd = dueWeekEnd; + } + + public Date getDueWeekStart() { + return dueWeekStart; + } + + public void setDueWeekStart(Date dueWeekStart) { + this.dueWeekStart = dueWeekStart; + } + + public Integer getStatus() { + return status; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public void setStatus(Integer status) { + this.status = status; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); + } + if (null != parentId) { + condition = condition.and("parentId", parentId, MongoOper.IS); + } + if (null != name) { + condition = condition.and("name", name, MongoOper.IS); + } + if (null != tireNumber) { + condition = condition.and("tireNumber", tireNumber, MongoOper.IS); + } + if (null != ztfx) { + condition = condition.and("ztfx", ztfx, MongoOper.IS); + } + if (null != phone) { + condition = condition.and("phone", phone, MongoOper.IS); + } + if (null != dueWeek) { + condition = condition.and("dueWeek", dueWeek, MongoOper.IS); + } + if (null != cqStatus) { + condition = condition.and("cqStatus", cqStatus, MongoOper.IS); + } + + if (null != cqResult) { + condition = condition.and("cqResult", cqResult, MongoOper.IS); + } + if (null != renShenResult) { + condition = condition.and("renShenResult", renShenResult, MongoOper.IS); + } + return condition.toMongoQuery(); + } + + + public Integer getCqResult() { + return cqResult; + } + + public void setCqResult(Integer cqResult) { + this.cqResult = cqResult; + } + + public void setRenShenResult(Integer renShenResult) { + this.renShenResult = renShenResult; + } + + public Integer getCqStatus() { + return cqStatus; + } + + public void setCqStatus(Integer cqStatus) { + this.cqStatus = cqStatus; + } + + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + + + public Integer getTireNumber() { + return tireNumber; + } + + public void setTireNumber(Integer tireNumber) { + this.tireNumber = tireNumber; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getZtfx() { + return ztfx; + } + + public void setZtfx(Integer ztfx) { + this.ztfx = ztfx; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index d6a5f93..59f21f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -1,14 +1,28 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.ChanQResultEnums; +import com.lyms.platform.common.enums.FuZhongEnums; +import com.lyms.platform.common.enums.RenShenJieJuEnums; +import com.lyms.platform.common.enums.SieveEnums; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.SieveFacade; import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest; +import com.lyms.platform.operate.web.request.CqSieveQueryRequest; import com.lyms.platform.operate.web.request.SieveAddRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; 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.validation.Valid; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 产筛接口 @@ -26,6 +40,8 @@ public class SieveController { * @param sieveAddRequest * @return */ + @ResponseBody + @RequestMapping(value = "/sieve",method = RequestMethod.POST) public BaseResponse addOneSieve(@RequestBody @Valid SieveAddRequest sieveAddRequest) { return sieveFacade.addOneSieve(sieveAddRequest); } @@ -36,7 +52,77 @@ public class SieveController { * @param chanQianDiaAddRequest * @return */ + @ResponseBody + @RequestMapping(value = "/cqsieve",method = RequestMethod.POST) public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest) { return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest); } -} + + @ResponseBody + @RequestMapping(value = "/cqsieve/enums",method = RequestMethod.GET) + public BaseResponse getEnums(){ + Map map = new HashMap<>(); + map.put("getChanQResultEnums",getChanQResultEnums()); + map.put("getCqResult",getCqResult()); + map.put("getSieveEnums",getSieveEnums()); + map.put("getRenShenJieJuEnums",getRenShenJieJuEnums()); + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + //产前诊断结果 + public List getChanQResultEnums() { + List list = new ArrayList<>(); + for (ChanQResultEnums enums : ChanQResultEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + //产前诊断结果 + public List getCqResult() { + List list = new ArrayList<>(); + for (ChanQResultEnums.CqResult enums : ChanQResultEnums.CqResult.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + //整体风险 + public List getSieveEnums() { + List list = new ArrayList<>(); + for (SieveEnums enums : SieveEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + //妊娠结局 + public List getRenShenJieJuEnums() { + List list = new ArrayList<>(); + for (RenShenJieJuEnums enums : RenShenJieJuEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + /** + * 查询产前筛查列表 + * + * @return + */ + @ResponseBody + @RequestMapping(value = "/cqsieve",method = RequestMethod.GET) + public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest){ + return sieveFacade.queryList(cqSieveQueryRequest); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index b195918..c21fd91 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -2,16 +2,26 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest; +import com.lyms.platform.operate.web.request.CqSieveQueryRequest; import com.lyms.platform.operate.web.request.SieveAddRequest; +import com.lyms.platform.operate.web.result.SieveListResult; import com.lyms.platform.pojo.SieveModel; +import com.lyms.platform.query.SieveQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; + /** * 产筛门面 - * + *

* Created by Administrator on 2016/6/30 0030. */ @Component @@ -25,7 +35,7 @@ public class SieveFacade { * @param sieveAddRequest * @return */ - public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest){ + public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest) { sieveService.addSieve(sieveAddRequest.convertToDataModel()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -34,11 +44,10 @@ public class SieveFacade { * 产前诊断 * * @param chanQianDiaAddRequest - * * @return */ - public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest) { - SieveModel sieveModel=new SieveModel(); + public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest) { + SieveModel sieveModel = new SieveModel(); sieveModel.setId(chanQianDiaAddRequest.getId()); sieveModel.setPublishName(chanQianDiaAddRequest.getPublishName()); sieveModel.setDiaTime(chanQianDiaAddRequest.getDiaTime()); @@ -48,4 +57,40 @@ public class SieveFacade { sieveService.updateOneChanQianDiaSieve(sieveModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -} + + /** + * 查询产筛列表数据 + * + * @param cqSieveQueryRequest + * @return + */ + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setPhone(cqSieveQueryRequest.getPhone()); + sieveQuery.setStatus(cqSieveQueryRequest.getStatus()); + sieveQuery.setCqResult(cqSieveQueryRequest.getCqResult()); + sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult()); + sieveQuery.setName(cqSieveQueryRequest.getName()); + sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo()); + sieveQuery.setDueWeekStart(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekStart())); + sieveQuery.setDueWeekEnd(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekEnd())); + sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); + sieveQuery.setIsNotify(cqSieveQueryRequest.getIsNotify()); + sieveQuery.setPage(cqSieveQueryRequest.getPage()); + sieveQuery.setLimit(cqSieveQueryRequest.getLimit()); + sieveQuery.setNeed("1"); + + //查询产筛list + List list = sieveService.queryList(sieveQuery); + List data = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { + for (SieveModel sieveModel : list) { + SieveListResult sieveListResult = new SieveListResult(); + sieveListResult.convertToResult(sieveModel); + data.add(sieveListResult); + } + } + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java index c9d0660..3a77150 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java @@ -17,20 +17,12 @@ public class ChanQianDiaAddRequest { @FormParam private String diaUnit;// 诊断单位 @FormParam - private String diaresult;//诊断结果 + private Integer diaresult;//诊断结果 @FormParam - private String pregnancyOutcome;// 妊娠结局 + private Integer pregnancyOutcome;// 妊娠结局 @FormParam private String publishName;// 录入人员; - public String getDiaresult() { - return diaresult; - } - - public void setDiaresult(String diaresult) { - this.diaresult = diaresult; - } - public String getDiaTime() { return diaTime; } @@ -56,12 +48,19 @@ public class ChanQianDiaAddRequest { } + public Integer getDiaresult() { + return diaresult; + } + + public void setDiaresult(Integer diaresult) { + this.diaresult = diaresult; + } - public String getPregnancyOutcome() { + public Integer getPregnancyOutcome() { return pregnancyOutcome; } - public void setPregnancyOutcome(String pregnancyOutcome) { + public void setPregnancyOutcome(Integer pregnancyOutcome) { this.pregnancyOutcome = pregnancyOutcome; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java new file mode 100644 index 0000000..c6a1b40 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -0,0 +1,122 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.core.annotation.form.Form; +/** + * 产前筛查查询请求 + * + * Created by Administrator on 2016/7/6 0006. + */ +@Form +public class CqSieveQueryRequest extends BasePageQueryRequest{ + //孕妇姓名 + @FormParam + private String name; + //母亲身份证 + @FormParam + private String cardNo; + //孕周开始 + @FormParam + private String dueWeekStart; + //孕周结束 + @FormParam + private String dueWeekEnd; + //整体风险 + @FormParam + private Integer ztfx; + //联系方式 + @FormParam + private String phone; + //是否通知 + @FormParam + private Integer isNotify; + //产前诊断结果 + @FormParam + private Integer cqResult; + //妊娠结局 + @FormParam + private Integer renShenResult; + //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 + @FormParam + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getCqResult() { + return cqResult; + } + + public void setCqResult(Integer cqResult) { + this.cqResult = cqResult; + } + + public String getDueWeekEnd() { + return dueWeekEnd; + } + + public void setDueWeekEnd(String dueWeekEnd) { + this.dueWeekEnd = dueWeekEnd; + } + + public String getDueWeekStart() { + return dueWeekStart; + } + + public void setDueWeekStart(String dueWeekStart) { + this.dueWeekStart = dueWeekStart; + } + + public Integer getIsNotify() { + return isNotify; + } + + public void setIsNotify(Integer isNotify) { + this.isNotify = isNotify; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Integer getRenShenResult() { + return renShenResult; + } + + public void setRenShenResult(Integer renShenResult) { + this.renShenResult = renShenResult; + } + + public Integer getZtfx() { + return ztfx; + } + + public void setZtfx(Integer ztfx) { + this.ztfx = ztfx; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java new file mode 100644 index 0000000..ff72c71 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -0,0 +1,153 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.enums.ChanQResultEnums; +import com.lyms.platform.common.enums.RenShenJieJuEnums; +import com.lyms.platform.common.enums.SieveEnums; +import com.lyms.platform.common.enums.TaiPanEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.SieveModel; + +import java.util.Date; + +/** + * Created by Administrator on 2016/7/5 0005. + */ +public class SieveListResult implements IBasicResultConvert { + private String id; + //患者id + private String parentId; + //姓名 + private String name; + //当前孕周 + private String cDueWeek; + //胎数 + private String tireNumber; + + //申请孕周 + private String dueWeek; + + //整体风险 + private String ztfx; + //联系方式 + private String phone; + + //产前诊断 1 已检查 0 未检查 + private String cqStatus; + //产前诊断结果 + private String cqResult; + //妊娠结局 + private String renShenResult; + + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + + public String getCqResult() { + return cqResult; + } + + public void setCqResult(String cqResult) { + this.cqResult = cqResult; + } + + public String getCqStatus() { + return cqStatus; + } + + public void setCqStatus(String cqStatus) { + this.cqStatus = cqStatus; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getRenShenResult() { + return renShenResult; + } + + public void setRenShenResult(String renShenResult) { + this.renShenResult = renShenResult; + } + + public String getTireNumber() { + return tireNumber; + } + + public void setTireNumber(String tireNumber) { + this.tireNumber = tireNumber; + } + + public String getZtfx() { + return ztfx; + } + + public void setZtfx(String ztfx) { + this.ztfx = ztfx; + } + + @Override + public SieveListResult convertToResult(SieveModel destModel) { + setId(destModel.getId()); + setParentId(destModel.getParentId()); + setName(destModel.getName()); + int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date()); + String week= (days/7)+""; + int day = (days%7); + this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + setTireNumber(TaiPanEnums.getTitle(destModel.getTireNumber() + "")); + setDueWeek(destModel.getDueWeek()); + setZtfx(SieveEnums.getTitle(destModel.getZtfx())); + setPhone(destModel.getPhone()); + setCqStatus(ChanQResultEnums.getTitle(destModel.getCqStatus())); + setCqResult(ChanQResultEnums.CqResult.getTitle(destModel.getCqResult())); + setRenShenResult(RenShenJieJuEnums.getTitle(destModel.getRenShenResult())); + //整体风险枚举 +// SieveEnums. + //妊娠结局 +// RenShenJieJuEnums + return this; + } +}