From 18ca94d80a3b1cb38cef7c08566a2d18c5cf02ea Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 23 Jul 2024 08:57:25 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PatientServiceController.java | 9 ++- .../web/controller/StatisticsController.java | 15 ++-- .../web/facade/AntenatalExaminationFacade.java | 88 +--------------------- 3 files changed, 20 insertions(+), 92 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 5c17058..9e5852c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -180,7 +180,8 @@ public class PatientServiceController extends BaseController { ps.setSerStatus(1); ps.setServiceWeek(yxzhVO.getWeeks()); ps.setSerType(1); - + ps.setSerEndTime(patientService.getSerEndTime()); + ps.setSerStartTime(patientService.getSerStartTime()); patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor)); } @@ -194,6 +195,8 @@ public class PatientServiceController extends BaseController { ps.setSerStatus(1); ps.setServiceWeek(yxzhVO.getWeeks()); ps.setSerType(6); + ps.setSerEndTime(patientService.getSerEndTime()); + ps.setSerStartTime(patientService.getSerStartTime()); baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor)); } @@ -207,6 +210,8 @@ public class PatientServiceController extends BaseController { ps.setSerStatus(1); ps.setServiceWeek(yxzhVO.getWeeks()); ps.setSerType(2); + ps.setSerEndTime(patientService.getSerEndTime()); + ps.setSerStartTime(patientService.getSerStartTime()); baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor)); } @@ -222,6 +227,8 @@ public class PatientServiceController extends BaseController { ps.setSerStatus(1); ps.setServiceWeek(yxzhVO.getWeeks()); ps.setSerType(20); + ps.setSerEndTime(patientService.getSerEndTime()); + ps.setSerStartTime(patientService.getSerStartTime()); baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index e49dcf3..991ad88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -1211,13 +1211,14 @@ public class StatisticsController extends BaseController { if (StringUtils.isEmpty(parentIds)){ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setNeed("1"); - antExRecordQuery.setParentIds(com.lyms.platform.common.utils.StringUtils.covertToList(parentIds, String.class)); - antExRecordQuery.setNeed("true"); - antExRecordQuery.setLimit(limit); - antExRecordQuery.setPage(page); - return antenatalExaminationFacade.antenatalExaminationStatisticsList(antExRecordQuery); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setNeed("1"); + patientsQuery.setYn(1); + patientsQuery.setIds(com.lyms.platform.common.utils.StringUtils.covertToList(parentIds, String.class)); + patientsQuery.setNeed("true"); + patientsQuery.setLimit(limit); + patientsQuery.setPage(page); + return antenatalExaminationFacade.antenatalExaminationStatisticsList(patientsQuery); } @RequestMapping(value = "/cjStatistics/enums", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e7fb77f..3e711a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -223,92 +223,12 @@ public class AntenatalExaminationFacade { return null; } - public BaseResponse antenatalExaminationStatisticsList(AntExRecordQuery antExRecordQuery){ + public BaseResponse antenatalExaminationStatisticsList(PatientsQuery patientsQuery){ BaseListResponse baseListResponse = new BaseListResponse(); - List data = new ArrayList<>(); - - List list2 = recordService.queryAntExRecords(antExRecordQuery); - if (CollectionUtils.isNotEmpty(list2)) { - for (AntExRecordModel record : list2) { - CjStatisticsListResult cjStatisticsListResult = new CjStatisticsListResult(); - cjStatisticsListResult.convertToResult(record); - Patients patients = patientsService.findOnePatientById(record.getParentId()); - String dueWeek = ""; - if (null != patients) { - //2017-03-15 高帆说的改成这样 - if (patients.getType()==1 &&patients.getLastMenses() != null && record.getCheckTime() != null) { - int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime()); - String week = (days / 7) + ""; - int day = (days % 7); - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - cjStatisticsListResult.setDueWeek(dueWeek); - }else if(patients.getType()==3 &&patients.getLastMenses() != null && patients.getDueDate() != null){ - int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getDueDate()); - String week = (days / 7) + ""; - int day = (days % 7); - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - cjStatisticsListResult.setDueWeek(dueWeek); - } - } - - - Users users = usersService.getUsers(NumberUtils.toInt(record.getCheckDoctor())); - if (null != users) { - cjStatisticsListResult.setCheckDoctor(users.getName()); - } - - //处理高危 - handleRisk(record, cjStatisticsListResult); - - data.add(cjStatisticsListResult); - } - } - - return baseListResponse.setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(antExRecordQuery.getPageInfo()); - - } - private void handleRisk(AntExRecordModel e, CjStatisticsListResult antExManagerResult) { - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(e.getfId())) { - String risk = null; - if (e.getType() == 2) { - AntExChuModel model = antExService.findOne(e.getfId()); - if (null != model) { - risk = model.getOtherHighRisk(); - } - } else if (e.getType() == 1) { - AntenatalExaminationModel model = antExService.findOneById(e.getfId()); - if (null != model) { - risk = model.getOtherRisk(); - } - } - StringBuffer name = new StringBuffer(); - Integer score = 0; - List> results = commonService.resolveOtherRisk(risk); - if (CollectionUtils.isNotEmpty(results)) { - for (Map result : results) { - //高危因素名字 - name.append(result.get("name").toString() + ","); - String level = result.get("levelId").toString(); - score += NumberUtils.toInt(result.get("score").toString(), 0); - if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { - e.gethLevel().add(level); - } - } - } - //高危因素 - antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); - String ri = commonService.resloveFactor(e.gethRisk()); - if (ri.isEmpty()) { - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name.toString())) { - ri = name.substring(0, name.length() - 1); - } - } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(name.toString())) { - ri += "," + name.substring(0, name.length() - 1); - } - antExManagerResult.setrRisk(ri); - antExManagerResult.setScore((e.gethScore() + score)); - } + List list= patientsService.queryPatient(patientsQuery); + return baseListResponse.setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(list).setPageInfo(patientsQuery.getPageInfo()); } + public BaseResponse antenatalExaminationStatistics(Integer userId){ String hospitalId = autoMatchFacade.getHospitalId(userId); AntExChuQuery antExChuQuery=new AntExChuQuery(); -- 1.8.3.1