diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java index 3d88c9e..9ae81ab 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -22,6 +22,16 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery private Date end; private String pid; + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getPid() { return pid; } @@ -85,7 +95,9 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery if(null!=parentId){ mongoCondition= mongoCondition.and("parentId",parentId, MongoOper.IS); } - + if(null!=hospitalId){ + mongoCondition=mongoCondition.and("hospitalId",hospitalId,MongoOper.IS); + } boolean isAddStart = Boolean.FALSE; Criteria c = null; if (null != start) { 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 e87b524..e756a3b 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 @@ -221,13 +221,13 @@ public class PatientFacade { if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { - data = convertToHighRisk(patientses); + data = convertToHighRisk(patientses,userId); } else if (type == 1) { //处理全部孕妇的情况 - data = convertToQuanPatient(patientses); + data = convertToQuanPatient(patientses,userId); //处理全部产妇 } else if (type == 3) { - data = convertToQuanCPatient(patientses); + data = convertToQuanCPatient(patientses,userId); } } return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); @@ -260,10 +260,10 @@ public class PatientFacade { * @param patientses 符合条件的产妇 * @return */ - private List convertToQuanCPatient(List patientses) { + private List convertToQuanCPatient(List patientses,Integer userId) { List data = new ArrayList<>(); - AntExChuQuery antExChuQuery = new AntExChuQuery(); AntExQuery antExQuery = new AntExQuery(); + String hospital=autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { QuanChanResult chanResult = new QuanChanResult(); chanResult.convertToResult(patients); @@ -305,6 +305,8 @@ public class PatientFacade { if (CollectionUtils.isNotEmpty(withList)) { chanResult.setcTimes(withList.size()); nextCheckTime = withList.get(0).getNextCheckTime(); + postReviewQuery.setHospitalId(hospital); + chanResult.setcHTimes(postReviewService.count(postReviewQuery)); if(StringUtils.isNotEmpty(withList.get(0).getProdDoctor())){ Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor())); if(null!=users){ @@ -319,10 +321,11 @@ public class PatientFacade { } - private List convertToQuanPatient(List patientses) { + private List convertToQuanPatient(List patientses,Integer userId) { AntExChuQuery antExChuQuery = new AntExChuQuery(); AntExQuery antExQuery = new AntExQuery(); List data = new ArrayList<>(); + String hospital=autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); quanPatientsResult.convertToResult(patients); @@ -360,6 +363,18 @@ public class PatientFacade { //初诊次数 int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); quanPatientsResult.setcTimes(i + b); + + + antExChuQuery.setHospitalId(hospital); + + antExQuery.setHospitalId(hospital); + //本院初诊 + int chi= antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); + + //本院复诊 + int chb= antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + quanPatientsResult.setcHTimes(chi+chb); + String nextCheckTime = ""; List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(examinationModels)) { @@ -384,10 +399,11 @@ public class PatientFacade { * @param patientses * @return */ - private List convertToHighRisk(List patientses) { + private List convertToHighRisk(List patientses,Integer userId) { AntExChuQuery antExChuQuery = new AntExChuQuery(); AntExQuery antExQuery = new AntExQuery(); List data = new ArrayList<>(); + String hospital=autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { RiskPatientsResult riskPatientsResult = new RiskPatientsResult(); riskPatientsResult.convertToResult(patients); @@ -423,8 +439,16 @@ public class PatientFacade { antExChuQuery.setParentId(patients.getId()); antExChuQuery.setYn(YnEnums.YES.getId()); //初诊次数 + int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); + antExQuery.setHospitalId(hospital); + //本院的复诊记录 + int chi=antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + antExChuQuery.setHospitalId(hospital); + //本院的初诊记录 + int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); riskPatientsResult.setcTimes(i + b); + riskPatientsResult.setcHTimes(chi+chb); String nextCheckTime = ""; List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(examinationModels)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 21595dc..ed769ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -24,6 +24,9 @@ public class QuanChanResult implements IBasicResultConvert