diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 2a65752..6a12ee7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -90,6 +90,8 @@ public class AntExChuModel implements Serializable { private Date created; private String hospitalId; private String bp; + //丈夫健康情况 + private String hHealthInfo; public String getPid() { return pid; @@ -203,14 +205,22 @@ public class AntExChuModel implements Serializable { this.syjg = syjg; } + public String gethHealthInfo() { + return hHealthInfo; + } + + public void sethHealthInfo(String hHealthInfo) { + this.hHealthInfo = hHealthInfo; + } + /*//心率 - private double heartRate; - //胎方位 - private String fetalPosition; - //胎先露 - private String fetalPresentation; - // 衔接 - private String join;*/ + private double heartRate; + //胎方位 + private String fetalPosition; + //胎先露 + private String fetalPresentation; + // 衔接 + private String join;*/ //高危因素 private String highrisk ; //高危评分 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 f938bea..5af649b 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 @@ -6,6 +6,7 @@ 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.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Arrays; @@ -70,7 +71,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { */ private int visitstatus = -1; - private String areaId; + //社区id private String areaIdOrRestId; //服务状态 @@ -92,6 +93,65 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Date lastCTimeEnd; private Integer postViewTimes; private boolean gtePostTimes=false; + //户籍地 + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + + //居住地 + private String provinceId; + private String cityId; + private String areaId; + //医院id + private List hospitalList; + + public String getProvinceRegisterId() { + return provinceRegisterId; + } + + public void setProvinceRegisterId(String provinceRegisterId) { + this.provinceRegisterId = provinceRegisterId; + } + + public String getCityRegisterId() { + return cityRegisterId; + } + + public void setCityRegisterId(String cityRegisterId) { + this.cityRegisterId = cityRegisterId; + } + + public String getAreaRegisterId() { + return areaRegisterId; + } + + public void setAreaRegisterId(String areaRegisterId) { + this.areaRegisterId = areaRegisterId; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public List getHospitalList() { + return hospitalList; + } + + public void setHospitalList(List hospitalList) { + this.hospitalList = hospitalList; + } public Integer getPostViewTimes() { return postViewTimes; @@ -617,9 +677,43 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); } - if (null != areaId) { + //居住地 + if (StringUtils.isNotEmpty(areaId)) { condition = condition.and("areaId", areaId, MongoOper.IS); } + if(StringUtils.isNotEmpty(cityId)){ + condition = condition.and("cityId", cityId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(provinceId)){ + condition = condition.and("provinceId", cityId, MongoOper.IS); + } + //户籍地 + if(StringUtils.isNotEmpty(provinceRegisterId)){ + condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(cityRegisterId)){ + condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS); + } + if(StringUtils.isNotEmpty(areaRegisterId)){ + condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); + } + + + /* //户籍地 + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + + //居住地 + private String provinceId; + private String cityId; + private String areaId; + //医院id + private List hospitalList;*/ + + + + if (StringUtils.isNotEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); } @@ -638,6 +732,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } else if (null != likeName) { condition = condition.and("username", likeName, MongoOper.LIKE); } + if(CollectionUtils.isNotEmpty(hospitalList)){ + condition = condition.and("hospitalId", hospitalList, MongoOper.IN); + }else if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } 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 f0fc1a5..4f290a8 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 @@ -92,7 +92,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(),"true"); + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.FALSE); } /** *全部孕妇管理 @@ -105,7 +105,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true"); + return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true",Boolean.FALSE); } @@ -133,7 +133,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true"); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.FALSE); } @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET) @@ -162,7 +162,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){ LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); - return patientFacade.findPatient(request,loginState.getId()); + return patientFacade.findPatient(request, loginState.getId()); } /** * 发送孕妇指导短信 @@ -174,6 +174,47 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest,HttpServletRequest request1){ LoginContext loginState = (LoginContext) request1.getAttribute("loginContext"); - return patientFacade.patientGuildSms(patientGuideSmsRequest,loginState.getId()); + return patientFacade.patientGuildSms(patientGuideSmsRequest, loginState.getId()); + } + + /** + * 区域高危孕妇管理 + * + * @param patientsQueryRequest 产妇管理修改接口 + * @return 返回结果 + */ + @RequestMapping(value = "/rhPuer", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.TRUE); + } + + /** + * 区域全部产妇 + * + * @return + */ + @RequestMapping(value = "/rapatients", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE); + } + + /** + *区域全部孕妇管理 + * + * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象) + * @return 返回结果 + */ + @RequestMapping(value = "/raPuer", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true",Boolean.TRUE); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 578aca8..2279cac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1385,11 +1385,38 @@ public class BookbuildingFacade { } } - public BaseListResponse queryBookBuild(BookBuildManagerQueryRequest bookBuildManagerQueryRequest){ + /** + * + * 建档管理页面 + * + * @param bookBuildManagerQueryRequest + * @return + */ + public BaseListResponse queryBookBuild(BookBuildManagerQueryRequest bookBuildManagerQueryRequest,Integer userId){ PatientsQuery patientsQuery1=new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); - yunBookbuildingService.queryPregnantWithQuery(patientsQuery1); - return new BaseListResponse(); + List buildType = new ArrayList(); + buildType.add(0); + buildType.add(2); + patientsQuery1.setBuildTypeList(buildType); + String hospitalId= autoMatchFacade.getHospitalId(userId); + patientsQuery1.setHospitalId(hospitalId); + patientsQuery1.setNeed("1"); + patientsQuery1.setLimit(bookBuildManagerQueryRequest.getLimit()); + patientsQuery1.setPage(bookBuildManagerQueryRequest.getPage()); + patientsQuery1.setPhone(bookBuildManagerQueryRequest.getPhone()); + patientsQuery1.setCardNo(bookBuildManagerQueryRequest.getCardNo()); + patientsQuery1.setPhone(bookBuildManagerQueryRequest.getPhone()); + + List patientses= yunBookbuildingService.queryPregnantWithQuery(patientsQuery1); + + BookBuildManagerResult bookBuildManagerResult=new BookBuildManagerResult(); + List data = new ArrayList<>(); + for(Patients patients: patientses){ + bookBuildManagerResult.convertToResult(patients); + + } + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } public BaseResponse findPatientById(String parentId,Integer userId){ 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 8ece7e2..5e5eff3 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 @@ -14,10 +14,14 @@ import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.worker.QuanChanPatientWorker; import com.lyms.platform.operate.web.worker.QuanPatientWorker; import com.lyms.platform.operate.web.worker.WorkHR; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; +import com.sun.javafx.collections.MappingChange; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -68,6 +72,10 @@ public class PatientFacade { @Autowired private SyncDataService syncDataService; + @Autowired + private DataPermissionService dataPermissionService; + @Autowired + private OrganizationService organizationService; private ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(15, 20, 1, TimeUnit.MINUTES, new LinkedBlockingQueue(5000)); @@ -200,7 +208,7 @@ public class PatientFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage) { + private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setPhone(riskPatientsQueryRequest.getPhone()); patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); @@ -213,7 +221,7 @@ public class PatientFacade { Date currentDate = DateUtil.formatDate(new Date()); patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes()); - if(null!=riskPatientsQueryRequest.getPostViewTimes() &&riskPatientsQueryRequest.getPostViewTimes()>=4){ + if (null != riskPatientsQueryRequest.getPostViewTimes() && riskPatientsQueryRequest.getPostViewTimes() >= 4) { patientsQuery.setGtePostTimes(true); } @@ -303,8 +311,63 @@ public class PatientFacade { buildType.add(0); buildType.add(2); patientsQuery.setBuildTypeList(buildType); - String hospital = autoMatchFacade.getHospitalId(userId); - patientsQuery.setHospitalId(hospital); + //居住地 + patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaId()); + patientsQuery.setCityId(riskPatientsQueryRequest.getCityId()); + patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceId()); + //户籍地 + patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaRegisterId()); + patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceRegisterId()); + patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityRegisterId()); + List hospitalList = null; + //区域范围内孕妇 + if (isRegion) { + //王平说的 必须要给区域医院权限，不然他就是蠢逼 201611124 16:41 + hospitalList = new ArrayList<>(); + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); + dataPermissionsModelQuery.setUserId(userId); + List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); + if (CollectionUtils.isNotEmpty(permissionsModels)) { + Set set = permissionsModels.get(0).getData().keySet(); + Iterator it = set.iterator(); + while (it.hasNext()) { + String id = it.next(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) { + hospitalList.add(id); + } + } + } + + if (StringUtils.isNotEmpty(riskPatientsQueryRequest.gethId())) { + List orgId = new ArrayList<>(); + orgId.add(riskPatientsQueryRequest.gethId()); + hospitalList.retainAll(orgId); + } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCprovinceId())) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setProvinceId(riskPatientsQueryRequest.getCprovinceId()); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCcityId())) { + organizationQuery.setCityId(riskPatientsQueryRequest.getCcityId()); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCareaId())) { + organizationQuery.setAreaId(riskPatientsQueryRequest.getCareaId()); + } + } + List orgId = new ArrayList<>(); + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization org : organizations) { + if (null != org.getId()) { + orgId.add(org.getId() + ""); + } + } + } + hospitalList.retainAll(orgId); + } + patientsQuery.setHospitalList(hospitalList); + } else { + String hospital = autoMatchFacade.getHospitalId(userId); + patientsQuery.setHospitalId(hospital); + } patientsQuery.setNeed(needPage); return patientsQuery; } @@ -318,9 +381,9 @@ public class PatientFacade { * @param type 控制类型 1孕妇 3产妇 * @return */ - public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage) { + public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) { //组合请求 - PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage); + PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); String hospital = autoMatchFacade.getHospitalId(userId); //查询符合条件的孕妇 @@ -385,7 +448,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService,patientsService))); + listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService))); } for (Future f : listFuture) { try { @@ -408,7 +471,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService,patientsService))); + listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService))); } for (Future f : listFuture) { try { @@ -436,7 +499,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService,patientsService))); + listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService))); } for (Future f : listFuture) { try { @@ -517,7 +580,7 @@ public class PatientFacade { if (patientsQueryRequest.getQueryType() != null) { // 0 高危孕妇 1 全部孕妇 2全部产妇 if (patientsQueryRequest.getQueryType() == 0) { - listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null); + listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { Map data = new HashMap<>(); @@ -552,7 +615,7 @@ public class PatientFacade { cnames.put("phone", "联系方式"); } else if (patientsQueryRequest.getQueryType() == 1) { - listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null); + listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { Map data = new HashMap<>(); @@ -585,7 +648,7 @@ public class PatientFacade { cnames.put("phone", "联系方式"); cnames.put("serviceType", "服务类型"); } else if (patientsQueryRequest.getQueryType() == 2) { - listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null); + listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { Map data = new HashMap<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 9ecbdd8..23bd03b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -46,6 +46,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Map ysfyHistory ; //本次妊娠情况 private Map cestationInfo; + //丈夫健康情况 + private Map hHealthInfo; //孕次 private Integer pregnancyTimes; @@ -272,6 +274,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.cDueWeek = cDueWeek; } + public Map gethHealthInfo() { + return hHealthInfo; + } + + public void sethHealthInfo(Map hHealthInfo) { + this.hHealthInfo = hHealthInfo; + } + public String getDueDate() { return dueDate; } @@ -876,6 +886,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setCervical(cervical); antExChuModel.setUterus(uterus); antExChuModel.setFujian(fujian); + if(null!=hHealthInfo){ + antExChuModel.sethHealthInfo(JsonUtil.obj2JsonString(hHealthInfo)); + } // antExChuModel.setMdxqsy(mdxqsy); antExChuModel.setHivkt(hivkt); antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw)); 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 index 24fb503..aadd7b3 100644 --- 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 @@ -75,6 +75,105 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { // 0 高危孕妇 1 全部孕妇 2全部产妇 private Integer queryType; + + //户籍id + private String provinceRegisterId; + private String cityRegisterId; + private String areaRegisterId; + + //居住地 + private String provinceId; + private String cityId; + private String areaId; + + //产检医院 + private String cprovinceId; + private String ccityId; + private String careaId; + // 医院id + private String hId; + + + public String getProvinceRegisterId() { + return provinceRegisterId; + } + + public void setProvinceRegisterId(String provinceRegisterId) { + this.provinceRegisterId = provinceRegisterId; + } + + public String getCityRegisterId() { + return cityRegisterId; + } + + public void setCityRegisterId(String cityRegisterId) { + this.cityRegisterId = cityRegisterId; + } + + public String getAreaRegisterId() { + return areaRegisterId; + } + + public void setAreaRegisterId(String areaRegisterId) { + this.areaRegisterId = areaRegisterId; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getCprovinceId() { + return cprovinceId; + } + + public void setCprovinceId(String cprovinceId) { + this.cprovinceId = cprovinceId; + } + + public String getCcityId() { + return ccityId; + } + + public void setCcityId(String ccityId) { + this.ccityId = ccityId; + } + + public String getCareaId() { + return careaId; + } + + public void setCareaId(String careaId) { + this.careaId = careaId; + } + + public String gethId() { + return hId; + } + + public void sethId(String hId) { + this.hId = hId; + } + public Integer getPostViewTimes() { return postViewTimes; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index 4acd8b3..5a256d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -63,6 +63,8 @@ public class AntexChuResult { private Map fksxHistory; // 叶酸服用 private Map ysfyHistory; + + private Map hHealthInfo; //孕次 private Integer pregnancyTimes; // 产次 @@ -860,6 +862,14 @@ public class AntexChuResult { this.parentId = parentId; } + public Map gethHealthInfo() { + return hHealthInfo; + } + + public void sethHealthInfo(Map hHealthInfo) { + this.hHealthInfo = hHealthInfo; + } + public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { setId(antExChuModel.getId()); @@ -873,6 +883,10 @@ public class AntexChuResult { } catch (Exception e) { } try { + sethHealthInfo(JsonUtil.str2Obj(antExChuModel.gethHealthInfo(), Map.class)); + } catch (Exception e) { + } + try { setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(), Map.class)); } catch (Exception e) { }