diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java index a478c09..4c9b14e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java @@ -59,6 +59,7 @@ public class PostpartumReportService { Map params=new HashMap<>(); params.put("id",postpartumReport.getId()); params.put("num",postpartumReport.getNum()); + params.put("name",postpartumReport.getName()); params.put("riskFactorName",postpartumReport.getRiskFactorName()); params.put("created",postpartumReport.getCreated()); params.put("deliveryModel",postpartumReport.getDeliveryModel()); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java index 52a1e9f..e9e97b1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java @@ -25,8 +25,19 @@ public class PostpartumReportQuery extends BaseQuery implements IConvertToNative private String rFactor; //次数 private Integer num; + private String riskFactorNames; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getRiskFactorNames() { return riskFactorNames; } @@ -103,6 +114,9 @@ public class PostpartumReportQuery extends BaseQuery implements IConvertToNative if (num!=null){ condition=condition.and("num",num,MongoOper.IS); } + if (StringUtils.isNotEmpty(name)){ + condition=condition.and("name",name,MongoOper.IS); + } if (StringUtils.isNotEmpty(riskFactorNames)){ condition=condition.and("riskFactorName",riskFactorNames,MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java index fd6ad61..f279f5d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java @@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +/** + * 产后营养报告模版 + */ @Controller @RequestMapping("/postpartumReport") public class PostpartumReportController extends BaseController { @@ -30,6 +33,7 @@ public class PostpartumReportController extends BaseController { @TokenRequired public BaseResponse getPostpartumReportList(@RequestParam(required = false) String rFactor, @RequestParam(required = false) Integer deliveryModel, + @RequestParam(required = false) String name, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, HttpServletRequest request) { @@ -37,6 +41,7 @@ public class PostpartumReportController extends BaseController { PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery(); postpartumReportQuery.setrFactor(rFactor); postpartumReportQuery.setDeliveryModel(deliveryModel); + postpartumReportQuery.setName(name); postpartumReportQuery.setPage(page); postpartumReportQuery.setLimit(limit); return postpartumReportFacade.queryPatient(postpartumReportQuery,getUserId(request)); @@ -66,6 +71,7 @@ public class PostpartumReportController extends BaseController { baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setObject(postpartumReportFacade.getPatient(id)); return baseResponse; } + @RequestMapping(method = RequestMethod.POST, value = "/update") @ResponseBody @TokenRequired @@ -76,4 +82,21 @@ public class PostpartumReportController extends BaseController { postpartumReportFacade.updateById(postpartumReport,postpartumReport.getId()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + /** + * 获取产妇报告详情 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatientInfo") + @ResponseBody + @TokenRequired + public BaseResponse getPatientInfo(@RequestParam String rFactor, + @RequestParam Integer deliveryModel, + @RequestParam Integer num,HttpServletRequest request){ + PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery(); + postpartumReportQuery.setDeliveryModel(deliveryModel); + postpartumReportQuery.setNum(num); + postpartumReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class)); + return postpartumReportFacade.getPatientInfo(postpartumReportQuery,getUserId(request)); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java index 64bdbf1..aef2698 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnancyReportController.java @@ -97,6 +97,26 @@ public class PregnancyReportController extends BaseController { return pregnancyReportFacade.getInfo(id,week); } + /** + * 获取小程序 + * @param rFactor + * @param week + * @return + */ + + @RequestMapping(method = RequestMethod.GET, value = "/wx/getPatientReport") + @ResponseBody + public BaseResponse getWxPatientReport(@RequestParam String rFactor, + @RequestParam Integer week, + @RequestParam String hospitalId + ){ + PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery(); + pregnancyReportQuery.setWeek(week); + pregnancyReportQuery.setHospitalId(hospitalId); + pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class)); + return pregnancyReportFacade.getWxPatientReport(pregnancyReportQuery); + } + /** * 获取体重报告列表 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index ef10fa5..268f2d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -5109,41 +5109,56 @@ public class BookbuildingFacade { } } - //yunBookbuildingService.updatePregnant(patient, patient.getId()); //patientServiceService.deletePatientServiceByPatientId(patient.getId()); - for (int i = 0; i < 2; i++) { - List> serInfos = new ArrayList<>(); - Map params = new HashMap<>(); - PatientService patientService = new PatientService(); - if (i == 0) { - params.put("serType", "1"); - } else { - params.put("serType", "6"); - } + /* PatientServiceQuery query=new PatientServiceQuery(); + query.setParentid(patient.getId()); + query.setSerType(1); + List patientServiceList= patientServiceService.queryPatientService(query); + if (CollectionUtils.isNotEmpty(patientServiceList)){*/ + //yunBookbuildingService.updatePregnant(patient, patient.getId()); + + for (int i = 0; i < 2; i++) { + List> serInfos = new ArrayList<>(); + Map params = new HashMap<>(); + PatientService patientService = new PatientService(); + if (i == 0) { + params.put("serType", "1"); + } else { + params.put("serType", "6"); + } + + params.put("doctorWeek", "0"); + params.put("serviceWeek", "42"); + serInfos.add(params); + patientService.setSerInfos(serInfos); + patientService.setPerType(1); + patientService.setCreateUser(patient.getFirstCheckId()); + //开通日期与建档日期一致 + patientService.setCreateDate(patient.getBookbuildingDate()); + patientService.setParentid(patient.getId()); + patientService.setPid(patient.getPid()); + try { + patientServiceFacade.addPatientService(patientService, patient.getOperator(), "2100001504"); + } catch (Exception e) { + System.out.println("孕妇建档服务开通异常！" + patient.toString()); + e.printStackTrace(); + } + } + - params.put("doctorWeek", "0"); - params.put("serviceWeek", "42"); - serInfos.add(params); - patientService.setSerInfos(serInfos); - patientService.setPerType(1); - patientService.setCreateUser(patient.getFirstCheckId()); - //开通日期与建档日期一致 - patientService.setCreateDate(patient.getBookbuildingDate()); - patientService.setParentid(patient.getId()); - patientService.setPid(patient.getPid()); - try { - patientServiceFacade.addPatientService(patientService, patient.getOperator(), "2100001504"); - } catch (Exception e) { - System.out.println("孕妇建档服务开通异常！" + patient.toString()); - e.printStackTrace(); - } - } } }); + //logger.info("建档信息异常---》" + patients.toString()); //continue; + }else { + logger.info("建档信息异常---》" + map.get("cardNo")); } + + }else { + System.out.println("cardNo exception---》" + map.get("cardNo")); } + /* if (map.get("phone") != null) { patientsQuery.setCardNo(null); patientsQuery.setPhone(map.get("phone")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java index 8919c29..f355652 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.PostpartumReportService; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.pojo.PostpartumReport; @@ -48,5 +49,15 @@ public class PostpartumReportFacade { return postpartumReportService.getPatient(id); } - + public BaseResponse getPatientInfo(PostpartumReportQuery postpartumReportQuery, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + postpartumReportQuery.setHospitalId(hospitalId); + postpartumReportQuery.setYn(1); + List list= postpartumReportService.queryPatientList(postpartumReportQuery); + BaseResponse baseResponse=new BaseResponse(); + baseResponse.setObject(list); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseResponse.setErrormsg("成功"); + return baseResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java index d299963..91e8480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java @@ -77,6 +77,35 @@ public class PregnancyReportFacade { } + public BaseResponse getWxPatientReport(PregnancyReportQuery pregnancyReportQuery){ + pregnancyReportQuery.setYn(1); + Integer week= pregnancyReportQuery.getWeek(); + pregnancyReportQuery.setWeek(getWeek(week)); + List list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery); + BaseResponse baseResponse=new BaseResponse(); + if (CollectionUtils.isNotEmpty(list)){ + PregnancyReport pregnancyReport= list.get(0); + PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); + postpartumReportQuery.setYn(1); + postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId()); + postpartumReportQuery.setWeek(week); + Integer riskType=1; + if (pregnancyReport.getRiskFactorName().contains("健康")){ + riskType=0; + } + postpartumReportQuery.setRiskType(riskType); + List mattersList= pregnancyReportMattersService.queryPregnancyReport(postpartumReportQuery); + if (CollectionUtils.isNotEmpty(mattersList)){ + pregnancyReport.setMatters(mattersList.get(0).getMatters()); + } + baseResponse.setObject(pregnancyReport); + } + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseResponse.setErrormsg("成功"); + return baseResponse; + } + + public BaseResponse getList(PregnancyReportQuery pregnancyReportQuery,Integer userId){ String hospitalId= autoMatchFacade.getHospitalId(userId); pregnancyReportQuery.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index c22220f..5ebfc36 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -198,7 +198,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("date", ymdDate); map.put("nowWeight", nowWeight); if ("2100002419".equals(hospitalId)){ - map.put("riskFactorId", patients.getRiskFactorId()); + map.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); map.put("week", patientWeight.getWeek()); } } @@ -211,7 +211,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("nowWeight", nowWeight); /*m.put("doctorId", doctorId);*/ if ("2100002419".equals(hospitalId)){ - m.put("riskFactorId", patients.getRiskFactorId()); + m.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); m.put("week", patientWeight.getWeek()); } dayWeights2.add(m); @@ -251,7 +251,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("date", DateUtil.getyyyy_MM_dd(new Date())); m.put("nowWeight", nowWeight); if ("2100002419".equals(hospitalId)){ - m.put("riskFactorId", patients.getRiskFactorId()); + m.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); m.put("week", patientWeight.getWeek()); } /*m.put("doctorId", doctorId);*/ @@ -886,6 +886,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient public BaseResponse lastCheckTime(String pid, String time) { PatientWeight patientWeight = queryPatientWeight(pid); Integer week = 0; + Map params=new HashMap<>(); if (null != patientWeight) { Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); if (patients != null) { @@ -898,9 +899,21 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } week = DateUtil.getWeek2(patients.getLastMenses(), recordDate); + params.put("week",week); + if (CollectionUtils.isNotEmpty(patientWeight.getDayWeights2())){ + Map map= patientWeight.getDayWeights2().get(0); + if (map.get("riskFactorId")!=null){ + params.put("riskFactorId",map.get("riskFactorId")); + }else { + params.put("riskFactorId",patients.getRiskFactorId()); + } + + }else { + params.put("riskFactorId",null); + } } } - return new BaseObjectResponse().setData(week).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return new BaseObjectResponse().setData(params).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @Override @@ -1417,7 +1430,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("nowWeight", nowWeight); //如果是大同添加当前患者高危因素 if ("2100002419".equals(hospitalId)){ - map.put("riskFactorId", patients.getRiskFactorId()); + map.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); map.put("week", patientWeight.getWeek()); } } else { @@ -1434,7 +1447,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("nowWeight", nowWeight); //如果是大同添加当前患者高危因素 if ("2100002419".equals(hospitalId)){ - m.put("riskFactorId", patients.getRiskFactorId()); + m.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); m.put("week", patientWeight.getWeek()); } dayWeights2.add(m); @@ -1454,7 +1467,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient m.put("nowWeight", nowWeight); //如果是大同添加当前患者高危因素 if ("2100002419".equals(hospitalId)){ - m.put("riskFactorId", patients.getRiskFactorId()); + m.put("riskFactorId", CollectionUtils.isNotEmpty(patients.getRiskFactorId())?patients.getRiskFactorId():null); m.put("week", patientWeight.getWeek()); } dayWeights2.add(m);