From 3eae6cb8183c6c61be1dda03eb01d97f5942f1a0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 23 Jun 2016 16:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IAntExChuDao.java | 8 + .../platform/biz/dal/impl/AntExChuDaoImpl.java | 9 ++ .../biz/service/AntenatalExaminationService.java | 12 +- .../platform/common/enums/ServiceTypeEnums.java | 2 +- .../main/java/com/lyms/platform/pojo/Patients.java | 6 +- .../com/lyms/platform/query/PatientsQuery.java | 28 +++- .../web/controller/PuerperaManageController.java | 68 +++++---- .../platform/operate/web/facade/PatientFacade.java | 104 ++++++++++--- .../web/request/RiskPatientsQueryRequest.java | 122 +++++++++++++++ .../operate/web/result/QuanPatientsResult.java | 152 +++++++++++++++++++ .../operate/web/result/RiskPatientsResult.java | 168 +++++++++++++++++++++ 11 files changed, 614 insertions(+), 65 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IAntExChuDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IAntExChuDao.java index d0c64b3..6e9a389 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IAntExChuDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IAntExChuDao.java @@ -48,4 +48,12 @@ public interface IAntExChuDao { * @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/AntExChuDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java index 2e77124..3565920 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AntExChuDaoImpl.java @@ -61,4 +61,13 @@ public class AntExChuDaoImpl extends BaseMongoDAOImpl implements public List query(MongoQuery query) { return find(query.convertToMongoQuery()); } + + /** + * 查询条数 + * @param query + * @return + */ + 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/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index 4a6bba4..b222e8d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -35,11 +35,19 @@ public class AntenatalExaminationService { } - public int queryVisitCount(VisitQuery visitQuery) { - return iAntenatalExaminationDao.queryAntenatalExaminationCount(visitQuery.convertToQuery()); + public int queryAntenatalExaminationCount(MongoQuery visitQuery) { + return iAntenatalExaminationDao.queryAntenatalExaminationCount(visitQuery); } /** + * 查询条数 + * @param query + * @return + */ + public int queryAntExChuCount(MongoQuery query){ + return (int)iAntExChuDao.count(query); + } + /** * 按条件查询所有 * * @param query diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java index 35b03cc..8aa7eb1 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -30,7 +30,7 @@ public enum ServiceTypeEnums { public String getName() { return name; } - public String getTitleById(int id){ + public static String getTitleById(int id){ for(ServiceTypeEnums enums:values()){ if(id==enums.getId()){ return enums.getName(); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index b0bc32c..179fad7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -322,7 +322,7 @@ public class Patients extends BaseModel { //风险等级颜色 private String riskLevelId; //高危评分值 - private String riskScore; + private Integer riskScore; private Integer serviceType; private Integer vip; //最后一次检查医生名称 @@ -356,11 +356,11 @@ public class Patients extends BaseModel { this.riskLevelId = riskLevelId; } - public String getRiskScore() { + public Integer getRiskScore() { return riskScore; } - public void setRiskScore(String riskScore) { + public void setRiskScore(Integer riskScore) { this.riskScore = riskScore; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index e70f0bb..aa2499f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -27,6 +27,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { */ private Boolean isNull; + private Boolean isHighRisk; + + public Boolean getIsHighRisk() { + return isHighRisk; + } + + public void setIsHighRisk(Boolean isHighRisk) { + this.isHighRisk = isHighRisk; + } + public Boolean getIsNull() { return isNull; } @@ -105,7 +115,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { /** * 高危评分 */ - private String hScore; + private Integer hScore; /** * 高危因素 */ @@ -185,11 +195,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.areaIdOrRestId = areaIdOrRestId; } - public String gethScore() { + public Integer gethScore() { return hScore; } - public void sethScore(String hScore) { + public void sethScore(Integer hScore) { this.hScore = hScore; } @@ -307,6 +317,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != communityId && !"-1".equals(communityId)) { condition = condition.and("communityId", communityId, MongoOper.IS); } + + if (null != hScore) { + condition = condition.and("riskScore", hScore, MongoOper.IS); + }else if(null!=isHighRisk){ + condition=condition.and("riskScore",0,MongoOper.GT); + } if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); } @@ -351,10 +367,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != rLevel) { condition = condition.and("riskLevelId", rLevel, MongoOper.IS); } - if (null != hScore) { - condition = condition.and("riskScore", hScore, MongoOper.IS); - } - if (null != hScore) { + + if (null != rFactor) { condition = condition.and("riskFactorId", rFactor, MongoOper.ALL); } if (-1 != yn) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index fc92933..a45cd5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -1,13 +1,15 @@ package com.lyms.platform.operate.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - 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.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.PatientFacade; +import com.lyms.platform.operate.web.facade.PuerperaManagerFacade; +import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; +import com.lyms.platform.operate.web.request.RiskPatientsQueryRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,14 +17,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.facade.PuerperaManagerFacade; -import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; /** - * 产妇管理接口 - * + * 孕产妇管理接口 + * * @author Administrator */ @Controller @@ -36,61 +36,65 @@ public class PuerperaManageController extends BaseController { /** * 产妇管理查询接口 - * + * * @param managerRequest * @return */ @RequestMapping(value = "/puerperamanage", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseListResponse queryPuerperaList(@Valid PuerperaManagerQueryRequest managerRequest,HttpServletRequest request) { + public BaseListResponse queryPuerperaList(@Valid PuerperaManagerQueryRequest managerRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.findPatientList(managerRequest,loginState.getId()); + return patientFacade.findPatientList(managerRequest, loginState.getId()); } /** - * * 产妇管理删除接口 - * + * * @param id 产妇id - * * @return 返回结果 */ @RequestMapping(value = "/puerperamanage", method = RequestMethod.DELETE) @ResponseBody @TokenRequired public BaseResponse deleteOnePuerperaById(@RequestParam("id") String id) { - //软删除数据 - return patientFacade.deleteOnePuerperaById(id, Boolean.TRUE); + //软删除数据 + return patientFacade.deleteOnePuerperaById(id, Boolean.TRUE); } /** - * * 产妇匹配社区 * * @param puerperaMatcherCommunityRequest 产妇匹配社区接口 - * * @return */ @ResponseBody @TokenRequired @RequestMapping(value = "/matchpuerpera", method = RequestMethod.POST) - public BaseResponse matchCommunity(@Valid PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){ - return patientFacade.matchCommunity(puerperaMatcherCommunityRequest); + public BaseResponse matchCommunity(@Valid PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest) { + return patientFacade.matchCommunity(puerperaMatcherCommunityRequest); } + /** - * 产妇管理修改 - * - * @param id 产妇id - * - * @param puerperaManagerUpdateRequest 产妇管理修改接口 - * + * 高危孕妇管理 + * + * @param patientsQueryRequest 产妇管理修改接口 * @return 返回结果 */ - /* - * @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT) - * @ResponseBody public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest - * puerperaManagerUpdateRequest) { puerperaManagerUpdateRequest.setId(id); return - * puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest); } + @RequestMapping(value = "/hPuer", method = RequestMethod.GET) + @ResponseBody + public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) { + return patientFacade.queryHighRisk(patientsQueryRequest,Boolean.TRUE); + } + /** + *全部孕妇管理 + * + * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) + * @return 返回结果 */ + @RequestMapping(value = "/aPuer", method = RequestMethod.GET) + @ResponseBody + public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) { + return patientFacade.queryHighRisk(patientsQueryRequest,null); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5abb0e4..24876f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1,23 +1,26 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.CommunityConfigService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; 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.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest; import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; +import com.lyms.platform.operate.web.request.RiskPatientsQueryRequest; import com.lyms.platform.operate.web.result.PuerperaResult; +import com.lyms.platform.operate.web.result.QuanPatientsResult; +import com.lyms.platform.operate.web.result.RiskPatientsResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.CommunityConfig; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; @@ -47,6 +50,8 @@ public class PatientFacade { private BasicConfigService basicConfigService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private AntenatalExaminationService antExService; /** * 修改产妇的社区 @@ -56,7 +61,7 @@ public class PatientFacade { */ public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest) { - if(0==puerperaMatcherCommunityRequest.getT()){ + if (0 == puerperaMatcherCommunityRequest.getT()) { Patients puerperaModel = patientsService.findOnePatientById(puerperaMatcherCommunityRequest.getParentId()); Assert.notNull(puerperaModel, "产妇信息不存在"); @@ -64,9 +69,9 @@ public class PatientFacade { puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId()); patientsService.updatePatient(puerperaModel); //修改新生儿的社区信息 - updateBabyCommunity(puerperaModel.getId(),puerperaModel.getPhone(),puerperaMatcherCommunityRequest.getCommunityId(),Boolean.FALSE); + updateBabyCommunity(puerperaModel.getId(), puerperaModel.getPhone(), puerperaMatcherCommunityRequest.getCommunityId(), Boolean.FALSE); - }else{ + } else { updateBabyCommunity(puerperaMatcherCommunityRequest.getParentId(), null, puerperaMatcherCommunityRequest.getCommunityId(), Boolean.TRUE); } @@ -77,21 +82,21 @@ public class PatientFacade { /** * 修改新生儿的社区信息 */ - private void updateBabyCommunity(String parentId,String phone,String communityId,boolean isBaby){ + private void updateBabyCommunity(String parentId, String phone, String communityId, boolean isBaby) { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - if(isBaby){ + if (isBaby) { babyModelQuery.setId(parentId); - }else{ + } else { babyModelQuery.setParentId(parentId); } BabyModel babyModel = new BabyModel(); babyModel.setCommunityId(communityId); - if(StringUtils.isNotEmpty(phone)){ + if (StringUtils.isNotEmpty(phone)) { babyModel.setMphone(phone); } - babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel); + babyService.findAndModify(babyModelQuery.convertToQuery(), babyModel); } /** @@ -112,7 +117,7 @@ public class PatientFacade { * @param managerRequest * @return */ - public BaseListResponse findPatientList(PuerperaManagerQueryRequest managerRequest,int userId) { + public BaseListResponse findPatientList(PuerperaManagerQueryRequest managerRequest, int userId) { PatientsQuery puerperaQuery = new PatientsQuery(); puerperaQuery.setLimit(managerRequest.getLimit()); puerperaQuery.setPage(managerRequest.getPage()); @@ -131,8 +136,8 @@ public class PatientFacade { puerperaQuery.setType(3); puerperaQuery.setNeed("1"); puerperaQuery.setYn(YnEnums.YES.getId()); - String areaid= autoMatchFacade.match(userId); - if(StringUtils.isNotEmpty(areaid)){ + String areaid = autoMatchFacade.match(userId); + if (StringUtils.isNotEmpty(areaid)) { puerperaQuery.setAreaId(areaid); } // 调用service查询 @@ -150,10 +155,10 @@ public class PatientFacade { comm = communityConfig.getName(); } } - String tips = visitFacade.getFindTips(model.getId(),Boolean.TRUE); - String addr= CommonsHelper.getFullAddress(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getAddress(), basicConfigService); - String restAddr=CommonsHelper.getFullAddress(model.getProvincePostRestId(), model.getCityPostRestId(), model.getAreaPostRestId(), model.getAddressPostRest(), basicConfigService); - data.add(result.convertToResult(model, comm, tips,addr,restAddr)); + String tips = visitFacade.getFindTips(model.getId(), Boolean.TRUE); + String addr = CommonsHelper.getFullAddress(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getAddress(), basicConfigService); + String restAddr = CommonsHelper.getFullAddress(model.getProvincePostRestId(), model.getCityPostRestId(), model.getAreaPostRestId(), model.getAddressPostRest(), basicConfigService); + data.add(result.convertToResult(model, comm, tips, addr, restAddr)); } } @@ -176,4 +181,63 @@ public class PatientFacade { } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -} + + /** + * 查询高危孕妇 + * + * @param riskPatientsQueryRequest + * @return + */ + public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest,Boolean isHighRisk) { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPhone(riskPatientsQueryRequest.getPhone()); + patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); + //设置为孕妇 + patientsQuery.setType(1); + patientsQuery.setName(riskPatientsQueryRequest.getName()); + patientsQuery.sethScore(riskPatientsQueryRequest.gethScore()); + patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor()); + patientsQuery.setServiceType(riskPatientsQueryRequest.getServiceType()); + patientsQuery.setAge(riskPatientsQueryRequest.getAge()); + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); + patientsQuery.setPage(riskPatientsQueryRequest.getPage()); + patientsQuery.setIsHighRisk(isHighRisk); + //查询符合条件的孕妇 + List patientses = patientsService.queryPatient(patientsQuery); + List data = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(patientses)) { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + AntExQuery antExQuery = new AntExQuery(); + //如果是查高危孕妇 + if(null!=isHighRisk&&Boolean.TRUE.equals(isHighRisk)){ + for (Patients patients : patientses) { + RiskPatientsResult riskPatientsResult = new RiskPatientsResult(); + riskPatientsResult.convertToResult(patients); + //复诊次数 + int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setYn(YnEnums.YES.getId()); + //初诊次数 + int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); + riskPatientsResult.setcTimes(i + b); + data.add(riskPatientsResult); + } + }else{ + //处理全部产妇的情况 + for (Patients patients : patientses) { + QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); + quanPatientsResult.convertToResult(patients); + //复诊次数 + int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setYn(YnEnums.YES.getId()); + //初诊次数 + int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); + quanPatientsResult.setcTimes(i + b); + data.add(quanPatientsResult); + } + } + } + return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java new file mode 100644 index 0000000..581f166 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.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/6/22 0022. + */ +@Form +public class RiskPatientsQueryRequest extends BasePageQueryRequest { + @FormParam + //孕妇名字 + private String name; + //孕妇身份证号 + @FormParam + private String cardNo; + //服务类型 + @FormParam + private String serviceType; + //孕周 + @FormParam + private String dueWeek; + //年龄 + @FormParam + private Integer age; + //风险等级 + @FormParam + private String rLevel; + //高危评分 + @FormParam + private Integer hScore; + //风险因素 + @FormParam + private String rFactor; + //联系方式 + @FormParam + private String phone; + //检查时间 + @FormParam + private String cTime; + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getcTime() { + return cTime; + } + + public void setcTime(String cTime) { + this.cTime = cTime; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public int gethScore() { + return hScore; + } + + public void sethScore(int hScore) { + this.hScore = hScore; + } + + 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 String getrFactor() { + return rFactor; + } + + public void setrFactor(String rFactor) { + this.rFactor = rFactor; + } + + public String getrLevel() { + return rLevel; + } + + public void setrLevel(String rLevel) { + this.rLevel = rLevel; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java new file mode 100644 index 0000000..bee07dc --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -0,0 +1,152 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.Patients; + +/** + * 全部孕妇管理 + * + * Created by Administrator on 2016/6/23 0023. + */ +public class QuanPatientsResult implements IBasicResultConvert { + private String id; + //名称 + private String name; + //年龄 + private Integer age; + //孕周 + private String dueWeek; + //风险等级 + private String rLevel; + + //产检次数 + private int cTimes; + //预产期 + private String dueDate; + //产检医生 + private String checkDoctor; + //登记人 + private String lName; + + //联系方式 + private String phone; + //预约产检时间 + private String cTime; + //服务类型 + private String serviceType; + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public String getcTime() { + return cTime; + } + + public void setcTime(String cTime) { + this.cTime = cTime; + } + + public int getcTimes() { + return cTimes; + } + + public void setcTimes(int cTimes) { + this.cTimes = cTimes; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + 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 getlName() { + return lName; + } + + public void setlName(String lName) { + this.lName = lName; + } + + 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 String getrLevel() { + return rLevel; + } + + public void setrLevel(String rLevel) { + this.rLevel = rLevel; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + @Override + public QuanPatientsResult convertToResult(Patients destModel) { + setId(destModel.getId()); + setName(destModel.getUsername()); + setAge(destModel.getAge()); + setDueWeek("孕周"); + setrLevel(destModel.getRiskLevelId()); + setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); + setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); + setPhone(destModel.getPhone()); + setCheckDoctor(destModel.getLastReportDoctorName()); + setlName("登记人"); + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); + return this; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java new file mode 100644 index 0000000..c9e0e77 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java @@ -0,0 +1,168 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.operate.web.request.BasePageQueryRequest; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.PuerperaModel; + +/** + * 高危孕妇管理查询 + *

+ * Created by Administrator on 2016/6/22 0022. + */ +public class RiskPatientsResult implements IBasicResultConvert { + //孕妇 + private String id; + //孕妇名字 + private String name; + //年龄 + private int age; + //孕周 + private String dueWeek; + //风险等级 + private String rLevel; + //风险因素 + private String rFactor; + //高危评分 + private int hScore; + //产检次数 + private int cTimes; + //预产期 + private String dueDate; + //产检医生 + private String checkDoctor; + //登记人 + private String lName; + + //联系方式 + private String phone; + //预约产检时间 + private String cTime; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + + + public String getcTime() { + return cTime; + } + + public void setcTime(String cTime) { + this.cTime = cTime; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public int gethScore() { + return hScore; + } + + public void sethScore(int hScore) { + this.hScore = hScore; + } + + 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 String getrFactor() { + return rFactor; + } + + public void setrFactor(String rFactor) { + this.rFactor = rFactor; + } + + public String getrLevel() { + return rLevel; + } + + public void setrLevel(String rLevel) { + this.rLevel = rLevel; + } + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public int getcTimes() { + return cTimes; + } + + public void setcTimes(int cTimes) { + this.cTimes = cTimes; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public String getlName() { + return lName; + } + + public void setlName(String lName) { + this.lName = lName; + } + + @Override + public RiskPatientsResult convertToResult(Patients destModel) { + setId(destModel.getId()); + setName(destModel.getUsername()); + setAge(destModel.getAge()); + setDueWeek("孕周"); + setrLevel(destModel.getRiskLevelId()); + setrFactor(JsonUtil.array2JsonString(destModel.getRiskFactorId())); + sethScore(destModel.getRiskScore()); + setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); + setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); + setPhone(destModel.getPhone()); + setCheckDoctor(destModel.getLastReportDoctorName()); + setlName("登记人"); + return this; + } +} -- 1.8.3.1