diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml index 71da72a..bf21b0c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml @@ -380,7 +380,7 @@ FROM patient_mark_hospital - and in_hospit_status = 2 + and in_hospit_result = 2 GROUP BY in_hospit_doctor; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java index d9bda2a..96a3e0f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java @@ -10,9 +10,13 @@ import com.lyms.platform.operate.web.request.PatientMarkRequest; import com.lyms.platform.permission.model.PatientMarkHospital; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** *

@@ -56,6 +60,20 @@ public class PatientMarkHospitalController extends BaseController { } /** + * 导出预约住院提统计 + * + * @param request + * @return + */ + @RequestMapping(value = "/extHospit", method = {RequestMethod.POST, RequestMethod.GET}) + @TokenRequired + public void extHospit(PatientMarkRequest patientMarkRequest + , HttpServletRequest request, HttpServletResponse resp) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientMarkHospFacade.extHospit(patientMarkRequest, loginState.getId(),resp); + } + + /** * 回院提醒统计 * @param request * @return @@ -68,6 +86,20 @@ public class PatientMarkHospitalController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return patientMarkHospFacade.reportBackHospit(patientMarkRequest, loginState.getId()); } + + /** + * 导出回院提醒统计 + * @param request + * @return + */ + @RequestMapping(value = "/extBackHospit", method = {RequestMethod.POST, RequestMethod.GET}) + @TokenRequired + public void extBackHospit(PatientMarkRequest patientMarkRequest + , HttpServletRequest request, HttpServletResponse resp) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientMarkHospFacade.extBackHospit(patientMarkRequest, loginState.getId(),resp); + } + /** * 住院提统计 * @param request @@ -81,6 +113,19 @@ public class PatientMarkHospitalController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return patientMarkHospFacade.reportInHospit(patientMarkRequest, loginState.getId()); } + + /** + * 导出住院提统计 + * @param request + * @return + */ + @RequestMapping(value = "/extInHospit", method = {RequestMethod.POST, RequestMethod.GET}) + @TokenRequired + public void extInHospit(PatientMarkRequest patientMarkRequest + , HttpServletRequest request, HttpServletResponse resp) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientMarkHospFacade.extInHospit(patientMarkRequest, loginState.getId(),resp); + } /** * 实际住院提统计 * @param request @@ -95,6 +140,18 @@ public class PatientMarkHospitalController extends BaseController { return patientMarkHospFacade.reportRealityHospit(patientMarkRequest, loginState.getId()); } /** + * 导出实际住院提统计 + * @param request + * @return + */ + @RequestMapping(value = "/extRealityHospit", method = {RequestMethod.POST, RequestMethod.GET}) + @TokenRequired + public void extRealityHospit(PatientMarkRequest patientMarkRequest + , HttpServletRequest request, HttpServletResponse resp) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientMarkHospFacade.extRealityHospit(patientMarkRequest, loginState.getId(),resp); + } + /** * 预约失败住院提统计 * @param request * @return @@ -109,6 +166,19 @@ public class PatientMarkHospitalController extends BaseController { } /** + * 导出预约失败住院提统计 + * @param request + * @return + */ + @RequestMapping(value = "/extFailureHospit", method = {RequestMethod.POST, RequestMethod.GET}) + @TokenRequired + public void extFailureHospit(PatientMarkRequest patientMarkRequest + , HttpServletRequest request, HttpServletResponse resp) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientMarkHospFacade.extFailureHospit(patientMarkRequest, loginState.getId(),resp); + } + + /** * 预约住院提醒列表 * * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 231bc6e..60b4c2e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.DefenceUtils; import com.lyms.platform.operate.web.request.PatientMarkRequest; import com.lyms.platform.operate.web.result.PatienMarkHospResult; +import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.PatientMarkHospitalLogService; import com.lyms.platform.permission.service.PatientMarkHospitalService; @@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.*; /** @@ -111,6 +113,63 @@ public class PatientMarkHospServiceFacade { } /** + * 导出住院预约统计 + * + * @param patientMarkRequest + * @param id + * @return + */ + public void extHospit(PatientMarkRequest patientMarkRequest, Integer id, HttpServletResponse resp) { + PatientMarkHospitalQuery query = new PatientMarkHospitalQuery(); + query.setMakeStartDate(patientMarkRequest.getMakeStartDate()); + query.setMakeEndDate(patientMarkRequest.getMakeEndDate()); + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + query.setHospitalId(hospitalId); + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + query.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + return; + } + + //统计数据 + List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByMakeDoctor(query); + + //列数据 + List legendData = new ArrayList<>(); + List> serData = new ArrayList<>(); + + int i = 1; + for (ReportMakeHosptail rm : reportMakeHosptails) { + Map map = new HashedMap(); + Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId())); + if (users != null) { + rm.setDoctorName(users.getName()); + } else { + rm.setDoctorName("产检医生"); + } + legendData.add(rm.getDoctorName()); + map.put("value", rm.getNum()); + map.put("name", rm.getDoctorName()); + map.put("id", i++); + serData.add(map); + } + + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("name", "操作员"); + cnames.put("value", "住院预约数"); + + ResponseUtil.responseExcel(cnames, serData, resp); + } + + /** * 回院预约统计 * * @param patientMarkRequest @@ -143,6 +202,9 @@ public class PatientMarkHospServiceFacade { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + //回院住院提醒状态必须是已提醒状态 + patientMarkHospQuery.setBackStatus(2); + //统计数据 List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByBackDoctor(patientMarkHospQuery); @@ -190,6 +252,69 @@ public class PatientMarkHospServiceFacade { return result; } + /** + * 导出回院预约统计 + * + * @param patientMarkRequest + * @param id + * @return + */ + public void extBackHospit(PatientMarkRequest patientMarkRequest, Integer id, HttpServletResponse resp) { + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + + + patientMarkHospQuery.setHospitalId(hospitalId); + patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate()); + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + return; + } + + //回院住院提醒状态必须是已提醒状态 + patientMarkHospQuery.setBackStatus(2); + + //统计数据 + List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByBackDoctor(patientMarkHospQuery); + + //列数据 + List legendData = new ArrayList<>(); + List> serData = new ArrayList<>(); + + int i = 1; + for (ReportMakeHosptail rm : reportMakeHosptails) { + legendData.add(rm.getDoctorName()); + Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId())); + if (users != null) { + rm.setDoctorName(users.getName()); + } else { + rm.setDoctorName("产检医生"); + } + Map map = new HashedMap(); + map.put("doctorName", rm.getDoctorName()); + map.put("succNum", rm.getSuccNum()); + map.put("errNum", rm.getErrNum()); + map.put("id", i++); + serData.add(map); + } + + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("doctorName", "操作员"); + cnames.put("succNum", "回院预约成功数"); + cnames.put("errNum", "回院预约成功数"); + ResponseUtil.responseExcel(cnames, serData, resp); + } + /** * 住院提醒统计 @@ -245,15 +370,15 @@ public class PatientMarkHospServiceFacade { succNum += rm.getSuccNum(); errNum += rm.getErrNum(); } - legendData.add("成功住院预约数量"); - legendData.add("失败预约住院数量"); + legendData.add("住院提醒成功总数"); + legendData.add("住院提醒失败总数"); Map map = new HashedMap(); map.put("value", succNum); - map.put("name", "回院提醒成功总数"); + map.put("name", "住院提醒成功总数"); serData.add(map); map = new HashedMap(); map.put("value", errNum); - map.put("name", "回院提醒失败总数"); + map.put("name", "住院提醒失败总数"); serData.add(map); @@ -268,6 +393,63 @@ public class PatientMarkHospServiceFacade { return result; } + + /** + * 导出住院提醒统计 + * + * @param patientMarkRequest + * @param id + * @return + */ + public void extInHospit(PatientMarkRequest patientMarkRequest, Integer id, HttpServletResponse resp) { + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + patientMarkHospQuery.setHospitalId(hospitalId); + patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate()); + + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + return; + } + + //统计数据 + List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByInDoctor(patientMarkHospQuery); + patientMarkHospQuery.setBackResult(1); + patientMarkHospQuery.setInHospitStatus(1); + List> serData = new ArrayList<>(); + + int i = 1; + for (ReportMakeHosptail rm : reportMakeHosptails) { + Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId())); + if (users != null) { + rm.setDoctorName(users.getName()); + } else { + rm.setDoctorName("产检医生"); + } + Map map = new HashedMap(); + map.put("doctorName", rm.getDoctorName()); + map.put("succNum", rm.getSuccNum()); + map.put("errNum", rm.getErrNum()); + map.put("id", i++); + serData.add(map); + } + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("doctorName", "操作员"); + cnames.put("succNum", "住院提醒成功总数"); + cnames.put("errNum", "住院提醒失败总数"); + ResponseUtil.responseExcel(cnames, serData, resp); + } + /** * 实际住院统计 * @@ -279,8 +461,8 @@ public class PatientMarkHospServiceFacade { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); - patientMarkHospQuery.setHospitStartDate(patientMarkRequest.getMakeStartDate()); - patientMarkHospQuery.setHospitEndDate(patientMarkRequest.getMakeEndDate()); + patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate()); patientMarkHospQuery.setHospitalId(hospitalId); PatientsQuery patientsQuery = new PatientsQuery(); @@ -311,8 +493,8 @@ public class PatientMarkHospServiceFacade { succNum += rm.getSuccNum(); num += rm.getNum(); } - legendData.add("住院提醒成功总数"); - legendData.add("实际住院总数"); + legendData.add("住院提醒成功人数"); + legendData.add("实际住院人数"); Map map = new HashedMap(); map.put("value", succNum); map.put("name", "实际住院总数"); @@ -333,6 +515,111 @@ public class PatientMarkHospServiceFacade { } /** + * 导出实际住院统计 + * + * @param patientMarkRequest + * @param id + * @return + */ + public void extRealityHospit(PatientMarkRequest patientMarkRequest, Integer id, HttpServletResponse resp) { + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + patientMarkHospQuery.setHospitStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setHospitEndDate(patientMarkRequest.getMakeEndDate()); + + patientMarkHospQuery.setHospitalId(hospitalId); + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + return; + } + List> serData = new ArrayList<>(); + //实际住院统计数据 + List reportMakeHosptails = patientMarkHospitalService.reportRealityByInDoctor(patientMarkHospQuery); + int i = 1; + for (ReportMakeHosptail rm : reportMakeHosptails) { + Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId())); + if (users != null) { + rm.setDoctorName(users.getName()); + } else { + rm.setDoctorName("产检医生"); + } + Map map = new HashedMap(); + map.put("doctorName", rm.getDoctorName()); + map.put("num", rm.getNum()); + map.put("succNum", rm.getSuccNum()); + map.put("id", i++); + serData.add(map); + } + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("doctorName", "操作员"); + cnames.put("num", "住院提醒成功人数"); + cnames.put("succNum", "实际住院人数"); + ResponseUtil.responseExcel(cnames, serData, resp); + } + + /** + * 导出预约失败统计 + * + * @param patientMarkRequest + * @param id + * @return + */ + public void extFailureHospit(PatientMarkRequest patientMarkRequest, Integer id, HttpServletResponse resp) { + //根据用户id获取医院ID + String hospitalId = autoMatchFacade.getHospitalId(id); + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + patientMarkHospQuery.setHospitalId(hospitalId); + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + return; + } + patientMarkHospQuery.setMakeStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate()); + + List> serData = new ArrayList<>(); + //提醒失败统计数据 + List reportMakeHosptails = patientMarkHospitalService.reportFailure(patientMarkHospQuery); + int i = 1; + for (ReportFailureHosptail rf : reportMakeHosptails) { + Map map = new HashedMap(); + map.put("type", rf.getType()); + map.put("num", rf.getNum()); + map.put("noPhoneNum", rf.getNoPhoneNum()); + map.put("indeterNum", rf.getIndeterNum()); + map.put("otherHospNum", rf.getOtherHospNum()); + map.put("otherNum", rf.getOtherNum()); + map.put("id", i++); + serData.add(map); + } + Map cnames = new LinkedHashMap<>(); + cnames.put("id", "#"); + cnames.put("type", "类型"); + cnames.put("num", "预约提醒总量"); + cnames.put("noPhoneNum", "电话无人接听"); + cnames.put("indeterNum", "暂时不确定"); + cnames.put("otherHospNum", "他院已办理"); + cnames.put("otherNum", "其他"); + ResponseUtil.responseExcel(cnames, serData, resp); + } + + + /** * 预约失败统计 * * @param patientMarkRequest @@ -404,9 +691,10 @@ public class PatientMarkHospServiceFacade { return result; } + public List setPatientIds(PatientMarkRequest patientMarkRequest, PatientsQuery patientsQuery, String hospitalId) { //根据查询号、当前孕周进行查询 - if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()|| StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { + if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd() || StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { if (null != patientMarkRequest.getcDueWeekStart()) { patientsQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientMarkRequest.getcDueWeekStart() * 7))); } @@ -485,7 +773,7 @@ public class PatientMarkHospServiceFacade { patientMarkHospitalService.addPatientMarkHospital(ps); //添加日志 - addPatientMarkHospLog(ps,1); + addPatientMarkHospLog(ps, 1); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -523,7 +811,7 @@ public class PatientMarkHospServiceFacade { ps.setInHospitStatus(2); } //添加日志 - addPatientMarkHospLog(ps,type); + addPatientMarkHospLog(ps, type); //根据用户id获取医院ID patientMarkHospitalService.updatePatientMarkHospital(ps); @@ -536,10 +824,11 @@ public class PatientMarkHospServiceFacade { /** * 添加住院预约日志 + * * @param ps * @param type （1-住院预约修改，2-回院提醒修改、3-住院提醒修改） */ - public void addPatientMarkHospLog(PatientMarkHospital ps,int type){ + public void addPatientMarkHospLog(PatientMarkHospital ps, int type) { PatientMarkHospitalLog markHospitalLog = new PatientMarkHospitalLog(); markHospitalLog.setId(UUID.randomUUID().toString().replace("-", "")); markHospitalLog.setHospitalId(ps.getHospitalId()); @@ -608,7 +897,7 @@ public class PatientMarkHospServiceFacade { if (ps.getBackResult() != null) { result.setBackResultStr(ps.getBackResult() == 1 ? "成功" : "失败"); //提醒结果为失败 - if (ps.getBackResult() == 2&&ps.getBackFailure() != null) { + if (ps.getBackResult() == 2 && ps.getBackFailure() != null) { result.setBackFailure(ps.getBackFailure()); result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure())); } @@ -708,14 +997,14 @@ public class PatientMarkHospServiceFacade { parentIds.add(pa.getId()); } patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); - } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()||StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd() || StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(new ArrayList()); } if (patientMarkRequest.getType() == 2) {//2-回院提醒 patientMarkHospQuery.setBackStatus(patientMarkRequest.getStatus()); patientMarkHospQuery.setBackResult(patientMarkRequest.getResult()); - if(patientMarkRequest.getFailure()!=null){ + if (patientMarkRequest.getFailure() != null) { //失败原因,则前提是提醒状态是失败 patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure()); patientMarkHospQuery.setBackResult(2); @@ -729,7 +1018,7 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setBackStatus(2); patientMarkHospQuery.setBackResult(1); patientMarkHospQuery.setInHospitResult(patientMarkRequest.getResult()); - if(patientMarkRequest.getFailure()!=null){ + if (patientMarkRequest.getFailure() != null) { //失败原因,则前提是提醒状态是失败 patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure()); patientMarkHospQuery.setInHospitResult(2); @@ -794,11 +1083,11 @@ public class PatientMarkHospServiceFacade { if (null != patients) { //住院结束时间 Date hospitEndDate = null; - if(ps.getInHospitMakeDate()!=null){ + if (ps.getInHospitMakeDate() != null) { hospitEndDate = ps.getInHospitMakeDate(); - }else if(ps.getBackMakeDate()!=null){ + } else if (ps.getBackMakeDate() != null) { hospitEndDate = ps.getBackMakeDate(); - }else{ + } else { hospitEndDate = ps.getMakeInHospitDate(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index f71691b..59ed8e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -159,7 +159,7 @@ public class PatientServiceFacade { patientServiceList.add(ps); } - synPatientService(patientServiceList.toArray(new PatientService[patientServiceList.size()])); + // synPatientService(patientServiceList.toArray(new PatientService[patientServiceList.size()])); BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(ps.getId()); @@ -181,7 +181,7 @@ public class PatientServiceFacade { ps.setUpdateDate(new Date()); ps.setUpdateUser(String.valueOf(id)); patientServiceService.updatePatientService(ps); - synPatientService(ps); + // synPatientService(ps); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg("成功");