diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWxController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWxController.java index 99681f8..2d1601f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWxController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWxController.java @@ -292,15 +292,7 @@ public class PatientWxController extends BaseController { return stopPregnancyFacade.queryInPerson2(userId); } - /** - * 危急列表 - * @param response - * @param page - * @param limit - * @param cardNo - * @param phone - */ /*@RequestMapping(value = "/wx/lisCrisisItems", method = RequestMethod.GET) public void getEmergenceTreatments(HttpServletResponse response, @RequestHeader("Authorization")String authorization, @@ -395,14 +387,14 @@ public class PatientWxController extends BaseController { return patientFacade.findPatient2(request, userId); } - /* @RequestMapping(method = RequestMethod.GET, value = "/wx/getGongGaoCurve") + @RequestMapping(method = RequestMethod.GET, value = "/wx/getGongGaoCurve") @ResponseBody public BaseResponse getGongGaoLine(@RequestParam(required = true) String patientId, @RequestHeader("Authorization")String authorization) { if (!authorization.contains(Authorization)){ return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); } return antenatalExaminationFacade.getGongGaoLine(patientId, userId); - }*/ + } @RequestMapping(method = RequestMethod.GET, value = "/wx/antex") @ResponseBody @@ -556,7 +548,7 @@ public class PatientWxController extends BaseController { return br; } - /* @Autowired + @Autowired private LisFacade lisFacade; @RequestMapping(method = RequestMethod.GET, value = "/dt/getLisAndRisData") @@ -576,7 +568,7 @@ public class PatientWxController extends BaseController { return lisFacade.getLisAndRisData(vcCardNo,sINCard, phone,cardNo, sortType,perType, userName,userId); } - *//** + /** * 增加产检高危手册（大同） * @param antExHighRiskModel * @return @@ -1133,16 +1125,15 @@ public class PatientWxController extends BaseController { } Map params=new HashMap<>(); if (doctors.contains(doctor)){ - doctor="孙慧洁"; + doctor="牛向静"; } params.put("doctor",doctor); params.put("ksrq",date); params.put("jsrq",date); - HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); + HttpClientUtil.doGet("http://172.26.1.190:9090/xtwx/getAppointment" ,params,"utf-8",null); return new BaseResponse(); } - /*@Autowired - private IdtdyrmFmService idtdyrmFmService; + //导出 @ResponseBody @@ -1160,8 +1151,8 @@ public class PatientWxController extends BaseController { if (doctors.contains(doctor)){ doctor="孙慧洁"; } - idtdyrmFmService.reportAppointmentList(response,doctor,startTime,endTime,name,doctorName); - }*/ + patientFacade.reportAppointmentList(response,doctor,startTime,endTime,name,doctorName); + } 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 cb91274..10013f9 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 @@ -24,14 +24,11 @@ import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.JxlsUtils; +import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.operate.web.worker.*; import com.lyms.platform.permission.dao.master.CouponMapper; -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.CouponService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -3699,4 +3696,110 @@ public class PatientFacade extends BaseServiceImpl { private PremaritalCheckupFacade premaritalCheckupFacade; @Autowired private ResidentsArchiveFacade residentsArchiveFacade; + @Autowired + private AppointmentService appointmentService; + @Autowired + private PatientServiceService patientServiceService; + + public void reportAppointmentList(HttpServletResponse response, String doctor, String startTime, String endTime, String name, String doctorName) { + Map cnames = new LinkedHashMap<>(); + cnames.put("建档状态", "建档状态"); + cnames.put("就诊卡号", "就诊卡号"); + cnames.put("就诊次数", "就诊次数"); + cnames.put("姓名", "姓名"); + cnames.put("服务开始时间", "服务开始时间"); + cnames.put("服务截止时间", "服务截止时间"); + cnames.put("手机号", "手机号"); + cnames.put("证件号", "证件号"); + cnames.put("出生日期", "出生日期"); + cnames.put("建档时间", "建档时间"); + cnames.put("就诊时间", "就诊时间"); + cnames.put("就诊医生", "就诊医生"); + cnames.put("科室", "科室"); + cnames.put("预约时间", "预约时间"); + String dept=null; + if ("孙慧洁".equals(doctor)){ + dept="产科"; + doctor=doctorName; + } + AppointmentQuery appointmentQuery=new AppointmentQuery(); + appointmentQuery.setDoctor(doctor); + appointmentQuery.setStartTime(startTime); + appointmentQuery.setEndTime(endTime); + appointmentQuery.setDept(dept); + appointmentQuery.setName(name); + List list= appointmentService.queryAppointment(appointmentQuery); + List> results = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { + PatientsQuery patientsQuery =new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId("2100002419"); + for (AppointmentModel appointmentModel : list) { + + Map result = new LinkedHashMap<>(); + String idCard=appointmentModel.getIdCard(); + String phone=appointmentModel.getPhone(); + String username=appointmentModel.getName(); + if (StringUtils.isNotEmpty(idCard)){ + patientsQuery.setName(null); + patientsQuery.setPhone(null); + patientsQuery.setCardNo(idCard); + }else { + if (StringUtils.isNotEmpty(username)&&StringUtils.isNotEmpty(phone)){ + patientsQuery.setCardNo(null); + patientsQuery.setName(username); + patientsQuery.setPhone(phone); + }else { + appointmentModel.setIsBuild(0); + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); + + } + } + if (appointmentModel.getIsBuild()==null){ + List patientsList= patientsService.queryPatient(patientsQuery); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientsList)){ + appointmentModel.setIsBuild(1); + Patients patients= patientsList.get(0); + appointmentModel.setBookbuildingDate(patients.getBookbuildingDate()); + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(patients.getId()); + patientQuery.setSerType(1); + + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientServices)){ + Date serEndTime= patientServices.get(0).getSerEndTime(); + Date serStartTime=patientServices.get(0).getUpdateDate(); + appointmentModel.setSerEndTime(serEndTime); + appointmentModel.setSerStartTime(serStartTime); + result.put("服务截止时间", DateUtil.gety_m_dhm(appointmentModel.getSerEndTime())); + } + }else { + appointmentModel.setIsBuild(0); + if (appointmentModel.getAppointmentNum()==null || appointmentModel.getAppointmentNum()==0){ + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); + } + } + } + result.put("建档状态",appointmentModel.getIsBuild()==1?"已建档":"未建档"); + result.put("就诊卡号", appointmentModel.getVccardNo()); + result.put("就诊次数",appointmentModel.getAppointmentNum()); + result.put("姓名", appointmentModel.getName()); + result.put("手机号", appointmentModel.getPhone()); + result.put("证件号", appointmentModel.getIdCard()); + result.put("出生日期",appointmentModel.getAge()); + result.put("服务开始时间",DateUtil.gety_m_dhm(appointmentModel.getSerStartTime())); + result.put("服务截至时间",DateUtil.gety_m_dhm(appointmentModel.getSerEndTime())); + result.put("建档时间",DateUtil.getYyyyMmDd(appointmentModel.getBookbuildingDate())); + result.put("就诊时间",DateUtil.gety_m_dhm(appointmentModel.getCheckTime())); + result.put("就诊医生",StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-"); + result.put("科室", appointmentModel.getDept()); + result.put("预约时间",DateUtil.gety_m_dhm(appointmentModel.getCreated())); + results.add(result); + + } + } + ResponseUtil.responseExcel(cnames, results, response); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index d6ddeb1..96ddf72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -638,6 +638,8 @@ public class StopPregnancyFacade { pmap.put("id", user.getId()); pmap.put("name", user.getName()); pmap.put("deptId", user.getDeptId()); + pmap.put("account",user.getAccount()); + pmap.put("x",user.getPwd()); list.add(pmap); } }