diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java b/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java index 07831a5..a7379e0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.result; +import com.lyms.platform.common.base.PageInfo; + public class BaseObjectResponse extends BaseResponse { /** @@ -9,6 +11,16 @@ public class BaseObjectResponse extends BaseResponse { private Object data; + private PageInfo pageInfo; + + public PageInfo getPageInfo() { + return pageInfo; + } + + public void setPageInfo(PageInfo pageInfo) { + this.pageInfo = pageInfo; + } + public Object getData() { return data; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index f38940d..79f1f7b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -33,6 +33,15 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { private String pid; private Date checkTimeStart; private Date checkTimeEnd; + private String checkDoctor; + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } public List getParentIds() { return parentIds; @@ -168,6 +177,9 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } + if (null != checkDoctor) { + condition = condition.and("prodDoctor", checkDoctor, MongoOper.IS); + } if (null != pid) { condition = condition.and("pid", pid, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 59cfdc2..6e9d755 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -30,12 +30,21 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private boolean neStart; private boolean neEnd; + private String checkDoctor; //大于修改时间 private Date gteModified; private Date gteCreated; + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + public List getParentIds() { return parentIds; } @@ -129,6 +138,9 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=id){ condition= condition.and("id",id, MongoOper.IS); } + if(null!=checkDoctor){ + condition= condition.and("checkDoctor",checkDoctor, MongoOper.IS); + } boolean isAddStart = Boolean.FALSE; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java index ca9e2c7..be13a01 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java @@ -2,12 +2,16 @@ package com.lyms.platform.operate.web.controller; import com.lyms.hospitalapi.pojo.ReportModel; import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.biz.service.YunBookbuildingService; 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.base.PageInfo; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.BeanUtils; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.AntextDoctorPatient; import com.lyms.platform.operate.web.result.AntextDoctorResult; @@ -19,6 +23,7 @@ import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.PatientsQuery; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -47,56 +52,202 @@ public class AntexDoctorStatistController extends BaseController { private YunBookbuildingService yunBookbuildingService; @Autowired private UsersService usersService; + @Autowired + private BasicConfigService basicConfigService; + @Autowired + private CommonService commonService; + /** - * 产检医生统计 + * 产检医生统计详情 * - * @param startDate 建档开始时间 - * @param endDate 建档结束时间 - * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @param startDate 建档开始时间 + * @param endDate 建档结束时间 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @param number 产检次数 点的是产检人数的话就传1, 2次(含)以上就传2, 5次(含)以上就传5 + * @param doctorId 医生ID + * @param currentPage 当前页 + * @param pageSize 每页显示的数量 * @return */ - @RequestMapping(method = RequestMethod.GET,value = "/getDoctorStatic") + @RequestMapping(method = RequestMethod.GET, value = "/doctorStatInfo") @ResponseBody @TokenRequired - public BaseObjectResponse getDoctorStatic(Date startDate,Date endDate,Integer childBirth ,HttpServletRequest request){ - BaseObjectResponse rest = new BaseObjectResponse(); - + public BaseObjectResponse doctorInfo(Date startDate, Date endDate, Integer childBirth, Integer number, String doctorId, + Integer currentPage, Integer pageSize, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + if(pageSize==null){ + pageSize = 20; + } + if(currentPage==null){ + currentPage = 1; + } + if(number == null){ + number=1; + } + + //获取患者信息 + List antextDoctorPatient = getPatientList(loginState.getId(), startDate, endDate, childBirth ,doctorId,number); + //结果数据集合 + Map resultInfo = new HashMap<>(); + + List patientIds = new ArrayList<>(); + + for (AntextDoctorPatient adp : antextDoctorPatient) { + if (resultInfo.containsKey(adp.getpId())) {//存在 + AntextDoctorPatient antextDoctorPatient1 = resultInfo.get(adp.getpId()); + antextDoctorPatient1.setCjNum(antextDoctorPatient1.getCjNum() + 1); + if (StringUtils.isNotEmpty(adp.getRiskFactors())) {//高危风险不为空 + antextDoctorPatient1.setRiskFactors(adp.getRiskFactors()); + } + if (CollectionUtils.isNotEmpty(adp.getRiskLevelId())) { + antextDoctorPatient1.setRiskLevelId(adp.getRiskLevelId()); + } + if (StringUtils.isNotEmpty(adp.getcDueWeek())) { + antextDoctorPatient1.setcDueWeek(adp.getcDueWeek()); + } + if (adp.getDueFmDate() != null) { + antextDoctorPatient1.setDueFmDate(adp.getDueFmDate()); + } + } else {//不存在 + patientIds.add(adp.getpId()); + adp.setCjNum(1); + resultInfo.put(adp.getpId(), adp); + } + } + if(CollectionUtils.isNotEmpty(patientIds)){ + getAllPatientList(patientIds, resultInfo); + } + + + List antextDoctorPatients = new ArrayList<>(); + + for (Map.Entry adp : resultInfo.entrySet()) { + AntextDoctorPatient antextDoctorPatient1 = adp.getValue(); + if(number==2){//2次及以上 + if(antextDoctorPatient1.getCjNum()>1){ + antextDoctorPatients.add(adp.getValue()); + } + }else if(number==5){//5次及以上 + if(antextDoctorPatient1.getCjNum()>4){ + antextDoctorPatients.add(adp.getValue()); + } + }else { + antextDoctorPatients.add(adp.getValue()); + } + } + + PageInfo pageInfo = new PageInfo(); + pageInfo.setLimit(pageSize); + pageInfo.setPage(currentPage); + pageInfo.setCount(resultInfo.size()); + + int startIndex = pageSize*(currentPage-1); + + List resultData = new ArrayList<>(); + + if(CollectionUtils.isNotEmpty(antextDoctorPatients)&&antextDoctorPatients.size()>startIndex){ + int size = startIndex+pageSize; + if(antextDoctorPatients.size() patientId, Map resultInfo) { + //根据patientId集合查询产检表、产检复查表,获取医生id、patientId列表 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + //患者集合 + antExChuQuery.setParentIds(patientId); + antExChuQuery.setYn(1); + //初诊集合列表 + List antExChuModels = antExService.queryAntExChu(antExChuQuery); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentIds(patientId); + antExQuery.setYn(1); + //复诊集合列表 + List antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); + + List antextDoctorPatient = new ArrayList<>(); + //添加初诊结果 + for (AntExChuModel ac : antExChuModels) { + AntextDoctorPatient doctorPatient = resultInfo.get(ac.getParentId()); + doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1); + + if (ac.getCheckTime().after(doctorPatient.getCheckTime())) { + doctorPatient.setCheckTime(ac.getCheckTime()); + doctorPatient.setCheckDoctor(ac.getProdDoctor()); + } + } + //添加复诊结果 + for (AntenatalExaminationModel aec : antenatalExaminationModels) { + AntextDoctorPatient doctorPatient = resultInfo.get(aec.getParentId()); + doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1); + if (aec.getCheckDate().after(doctorPatient.getCheckTime())) { + doctorPatient.setCheckTime(aec.getCheckDate()); + doctorPatient.setCheckDoctor(aec.getCheckDoctor()); + } + } + } + + + public List getPatientList(Integer userId, Date startDate, Date endDate, Integer childBirth,String doctorId,Integer number) { + //根据当前登录人获取医院id - String hospital = autoMatchFacade.getHospitalId(loginState.getId()); + String hospital = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); //医院id patientsQuery.setHospitalId(hospital); - if(startDate!=null){ + if (startDate != null) { //建档开始时间 patientsQuery.setBookbuildingDateStart(startDate); } - if(endDate!=null){ + if (endDate != null) { //建档结束时间 patientsQuery.setBookbuildingDateEnd(endDate); } //有效 patientsQuery.setYn(1); - if(childBirth!=null){ + if (childBirth != null) { patientsQuery.setType(childBirth); } //获取患者集合 List patientss = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); + + if(CollectionUtils.isEmpty(patientss)){ + return new ArrayList<>(); + } //患者id List pIds = new ArrayList<>(); - for(Patients ps : patientss){ + Map patientsMap = new HashMap<>(); + for (Patients ps : patientss) { pIds.add(ps.getId()); + patientsMap.put(ps.getId(), ps); } + //根据patientId集合查询产检表、产检复查表,获取医生id、patientId列表 AntExChuQuery antExChuQuery = new AntExChuQuery(); //患者集合 antExChuQuery.setParentIds(pIds); + if(StringUtils.isNotEmpty(doctorId)){ + antExChuQuery.setCheckDoctor(doctorId); + } antExChuQuery.setYn(1); antExChuQuery.setHospitalId(hospital); //初诊集合列表 List antExChuModels = antExService.queryAntExChu(antExChuQuery); AntExQuery antExQuery = new AntExQuery(); + if(StringUtils.isNotEmpty(doctorId)){ + antExQuery.setCheckDoctor(doctorId); + } antExQuery.setHospitalId(hospital); antExQuery.setParentIds(pIds); antExQuery.setYn(1); @@ -104,21 +255,79 @@ public class AntexDoctorStatistController extends BaseController { List antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); List antextDoctorPatient = new ArrayList<>(); - for(AntExChuModel ac : antExChuModels){ + //添加初诊结果 + for (AntExChuModel ac : antExChuModels) { AntextDoctorPatient adp = new AntextDoctorPatient(); adp.setDoctorId(ac.getProdDoctor()); - adp.setpId(ac.getPid()); + adp.setpId(ac.getParentId()); + Patients patients = patientsMap.get(ac.getParentId()); + if (patients.getType() == 1) {//孕妇 + //计算孕周 + adp.setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(patients.getLastMenses(), new Date()))); + adp.setDueFmDate(patients.getDueDate()); + } else if (patients.getType() == 3) {//3-产妇 + adp.setcDueWeek("已分娩"); + adp.setDueFmDate(patients.getFmDate()); + } + adp.setCheckTime(ac.getCheckTime()); + adp.setpName(patients.getUsername()); + //高危因数 + adp.setRiskFactors(commonService.resloveFactor(patients.getRiskFactorId())); + //高危等级颜色 + adp.setRiskLevelId(commonService.findRiskLevel(patients.getRiskLevelId())); antextDoctorPatient.add(adp); } - for(AntenatalExaminationModel aec : antenatalExaminationModels){ + //添加复诊结果 + for (AntenatalExaminationModel aec : antenatalExaminationModels) { AntextDoctorPatient adp = new AntextDoctorPatient(); adp.setDoctorId(aec.getCheckDoctor()); - adp.setpId(aec.getPid()); + adp.setpId(aec.getParentId()); + adp.setCheckTime(aec.getCheckDate()); antextDoctorPatient.add(adp); } - Map adr1 = new HashMap<>(); + if(number!=null){ + if(number == 2){ + for(AntextDoctorPatient ad :antextDoctorPatient){ + if(ad.getCjNum()<2){ + antextDoctorPatient.remove(ad); + } + } + }else if(number == 5){ + for(AntextDoctorPatient ad :antextDoctorPatient){ + if(ad.getCjNum()<5){ + antextDoctorPatient.remove(ad); + } + } + } + } + + + + return antextDoctorPatient; + } + + /** + * 产检医生统计 + * + * @param startDate 建档开始时间 + * @param endDate 建档结束时间 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getDoctorStatic") + @ResponseBody + @TokenRequired + public BaseObjectResponse getDoctorStatic(Date startDate, Date endDate, Integer childBirth, HttpServletRequest request) { + BaseObjectResponse rest = new BaseObjectResponse(); + + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + + //获取患者信息 + List antextDoctorPatient = getPatientList(loginState.getId(), startDate, endDate, childBirth,null,null); + + Map adr1 = new HashMap<>(); //医生ID+患者ID 用与医生对于产检人数 + 总人数:患者ID - Map dpm = new HashMap<>(); + Map dpm = new HashMap<>(); //产检总人数 int allCount = 0; @@ -129,40 +338,40 @@ public class AntexDoctorStatistController extends BaseController { //产检五次及以上; int allFive = 0; - for(AntextDoctorPatient adp : antextDoctorPatient){ - if(!dpm.containsKey(adp.getpId())){ + for (AntextDoctorPatient adp : antextDoctorPatient) { + if (!dpm.containsKey(adp.getpId())) { allCount++; - dpm.put(adp.getpId(),1); - }else{ - Integer cjrc = dpm.get(adp.getpId()); + dpm.put(adp.getpId(), 1); + } else { + Integer cjrc = dpm.get(adp.getpId()); cjrc++; - if(cjrc == 2){ + if (cjrc == 2) { allDoub++; } - if(cjrc == 5){ + if (cjrc == 5) { allFive++; } - dpm.put(adp.getpId(),cjrc); + dpm.put(adp.getpId(), cjrc); } allCjrc++; - if(adr1.containsKey(adp.getDoctorId())){ + if (adr1.containsKey(adp.getDoctorId())) { AntextDoctorResult adr = adr1.get(adp.getDoctorId()); - if(!dpm.containsKey(adp.getDoctorId()+adp.getpId())){//如果不存在,产检人数加1 - adr.setInspectPeople(adr.getInspectPeople()+1); - dpm.put(adp.getDoctorId()+adp.getpId(),1); - }else{//如果存在,则检测测试加一 - Integer num = dpm.get(adp.getDoctorId()+adp.getpId()); + if (!dpm.containsKey(adp.getDoctorId() + adp.getpId())) {//如果不存在,产检人数加1 + adr.setInspectPeople(adr.getInspectPeople() + 1); + dpm.put(adp.getDoctorId() + adp.getpId(), 1); + } else {//如果存在,则检测测试加一 + Integer num = dpm.get(adp.getDoctorId() + adp.getpId()); ++num; - if(num == 2){ - adr.setTwice(adr.getTwice()+1); - }else if(num==5){ - adr.setFiveTimes(adr.getFiveTimes()+1); + if (num == 2) { + adr.setTwice(adr.getTwice() + 1); + } else if (num == 5) { + adr.setFiveTimes(adr.getFiveTimes() + 1); } - dpm.put(adp.getDoctorId()+adp.getpId(),num); + dpm.put(adp.getDoctorId() + adp.getpId(), num); } - adr.setInspectTime(adr.getInspectTime()+1); - }else{ + adr.setInspectTime(adr.getInspectTime() + 1); + } else { AntextDoctorResult adr = new AntextDoctorResult(); adr.setDoctorId(adp.getDoctorId()); adr.setInspectPeople(1); @@ -171,38 +380,38 @@ public class AntexDoctorStatistController extends BaseController { adr.setFiveTimes(0); adr.setTwiceProportion(""); adr.setFiveTimeProportion(""); - adr1.put(adp.getDoctorId(),adr); - dpm.put(adp.getDoctorId()+adp.getpId(),1); + adr1.put(adp.getDoctorId(), adr); + dpm.put(adp.getDoctorId() + adp.getpId(), 1); } } - List> gridList = new ArrayList<>(); + List> gridList = new ArrayList<>(); //存总计 gridList.add(new HashedMap()); //表表图数据 List doctorInfo = new ArrayList<>(); - for(Map.Entry adr : adr1.entrySet()){ + for (Map.Entry adr : adr1.entrySet()) { // System.out.println(adr.getValue().toString()); AntextDoctorResult ar = adr.getValue(); - if(StringUtils.isNotEmpty(ar.getDoctorId())){ - Users users = usersService.getUsers(Integer.parseInt(ar.getDoctorId())); - if(users!=null){ + if (StringUtils.isNotEmpty(ar.getDoctorId())) { + Users users = usersService.getUsers(Integer.parseInt(ar.getDoctorId())); + if (users != null) { ar.setDoctorName(users.getName()); - }else{ + } else { ar.setDoctorName("产检医生"); } - }else{ + } else { ar.setDoctorName("产检医生"); } - if(ar.getTwice()>0){ + if (ar.getTwice() > 0) { DecimalFormat df = new DecimalFormat("0.0");//格式化小数,不足的补0 - ar.setTwiceProportion(df.format((float)ar.getTwice()/ar.getInspectPeople()*100)+"%"); + ar.setTwiceProportion(df.format((float) ar.getTwice() / ar.getInspectPeople() * 100) + "%"); } - if(ar.getFiveTimes()>0){ + if (ar.getFiveTimes() > 0) { DecimalFormat df = new DecimalFormat("0.0");//格式化小数,不足的补0 - ar.setFiveTimeProportion(df.format((float)ar.getFiveTimes()/ar.getInspectPeople()*100)+"%"); + ar.setFiveTimeProportion(df.format((float) ar.getFiveTimes() / ar.getInspectPeople() * 100) + "%"); } gridList.add(BeanUtils.objectToObjectMap(ar)); @@ -224,26 +433,26 @@ public class AntexDoctorStatistController extends BaseController { String allDoubBl = ""; String allFiveBl = ""; - if(allDoub>0){ + if (allDoub > 0) { //两次比例 - allDoubBl = df.format((float)allDoub/allCount*100)+"%"; + allDoubBl = df.format((float) allDoub / allCount * 100) + "%"; } - if(allFive>0){ + if (allFive > 0) { //五次比例 - allFiveBl = df.format((float)allFive/allCount*100)+"%"; + allFiveBl = df.format((float) allFive / allCount * 100) + "%"; } // System.out.println("总人数:"+allCount+",总人次:"+allCjrc+",总2次以上:"+allDoub+",总5次以上:"+allFive+",总两次比例:"+allDoubBl+",总五次比例:"+allFiveBl); //填充总计数据 - Map allMap = gridList.get(0); - allMap.put("doctorName","总计"); - allMap.put("inspectTime",allCjrc); - allMap.put("inspectPeople",allCount); - allMap.put("twice",allDoub); - allMap.put("twiceProportion",allDoubBl); - allMap.put("fiveTimes",allFive); - allMap.put("fiveTimeProportion",allFiveBl); + Map allMap = gridList.get(0); + allMap.put("doctorName", "总计"); + allMap.put("inspectTime", allCjrc); + allMap.put("inspectPeople", allCount); + allMap.put("twice", allDoub); + allMap.put("twiceProportion", allDoubBl); + allMap.put("fiveTimes", allFive); + allMap.put("fiveTimeProportion", allFiveBl); ReportModel reportModel = new ReportModel(); reportModel.setDoctorInfo(doctorInfo); /** 医生数据详情 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java index bd45fe9..1fce121 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.result; +import java.util.Date; +import java.util.List; + /** * @auther yangfei * @createTime 2017年07月05日 16时58分 @@ -10,6 +13,96 @@ public class AntextDoctorPatient { private String doctorId; //患者ID private String pId; + //患者姓名 + private String pName; + //本院产检次数 + private int cjNum; + //产检总次数 + private int allCjNum; + //高危风险 + private String riskFactors; + //风险等级颜色 + private List riskLevelId; + //孕周或已分娩 + private String cDueWeek; + //预产期或分娩日期 + private Date dueFmDate; + //产检时间 + private Date checkTime; + //产检医生 + private String checkDoctor; + + public Date getCheckTime() { + return checkTime; + } + + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public String getCheckDoctor() { + return checkDoctor; + } + + public void setCheckDoctor(String checkDoctor) { + this.checkDoctor = checkDoctor; + } + + public int getCjNum() { + return cjNum; + } + + public int getAllCjNum() { + return allCjNum; + } + + public void setAllCjNum(int allCjNum) { + this.allCjNum = allCjNum; + } + + public void setCjNum(int cjNum) { + this.cjNum = cjNum; + } + + public String getpName() { + return pName; + } + + public void setpName(String pName) { + this.pName = pName; + } + + public String getcDueWeek() { + return cDueWeek; + } + + public void setcDueWeek(String cDueWeek) { + this.cDueWeek = cDueWeek; + } + + public Date getDueFmDate() { + return dueFmDate; + } + + public void setDueFmDate(Date dueFmDate) { + this.dueFmDate = dueFmDate; + } + + public String getRiskFactors() { + return riskFactors; + } + + public void setRiskFactors(String riskFactors) { + this.riskFactors = riskFactors; + } + + public List getRiskLevelId() { + return riskLevelId; + } + + public void setRiskLevelId(List riskLevelId) { + this.riskLevelId = riskLevelId; + } public String getDoctorId() { return doctorId; @@ -26,4 +119,21 @@ public class AntextDoctorPatient { public void setpId(String pId) { this.pId = pId; } + + @Override + public String toString() { + return "AntextDoctorPatient{" + + "doctorId='" + doctorId + '\'' + + ", pId='" + pId + '\'' + + ", pName='" + pName + '\'' + + ", cjNum=" + cjNum + + ", allCjNum=" + allCjNum + + ", riskFactors='" + riskFactors + '\'' + + ", riskLevelId=" + riskLevelId + + ", cDueWeek='" + cDueWeek + '\'' + + ", dueFmDate=" + dueFmDate + + ", checkTime=" + checkTime + + ", checkDoctor='" + checkDoctor + '\'' + + '}'; + } }