From 4efbf3112981de04eca5b945087a7a6f267b4ffa Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 21 Jun 2018 11:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/SieveApplyOrderModel.java | 22 ++++++ .../operate/web/controller/SieveController.java | 19 ++++- .../platform/operate/web/facade/SieveFacade.java | 87 ++++++++++++++++++++++ .../web/request/SieveApplyOrderAddRequest.java | 28 +++++++ 4 files changed, 155 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 674c2e7..3c94a6c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -72,6 +72,28 @@ public class SieveApplyOrderModel extends BaseModel { //申请医院 private String applyHospitalId; + //送检医生 + private String sendDoctor; + + //送检日期 + private Date sendTime; + + public String getSendDoctor() { + return sendDoctor; + } + + public void setSendDoctor(String sendDoctor) { + this.sendDoctor = sendDoctor; + } + + public Date getSendTime() { + return sendTime; + } + + public void setSendTime(Date sendTime) { + this.sendTime = sendTime; + } + public Date getBirth() { return birth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 559bf74..0a6bfe4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -75,7 +75,8 @@ public class SieveController extends BaseController { } /** - * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案 + * 添加查询前 查询孕妇基本信息 + * 如果孕妇没有在本院建档就添加隐藏档案 * * @param request * @return @@ -89,6 +90,22 @@ public class SieveController extends BaseController { } + /** + * 查看申请单 + * @param parentId + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET) + public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return sieveFacade.getSieveApplyInfo(parentId, loginState.getId()); + } + + + /** * 产前诊断 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 377f30c..7b6fa28 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -632,4 +632,91 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } + + public BaseResponse getSieveApplyInfo(String parentId, Integer userId) { + + Map map = new HashMap<>(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setId(parentId); + + List localPatients = patientsService.queryPatient(patientsQuery); + Patients pat = null; + if (CollectionUtils.isNotEmpty(localPatients)) + { + pat = localPatients.get(0); + } + else + { + patientsQuery.setHospitalId(null); + List areaPatients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(areaPatients)) { + pat = areaPatients.get(0); + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { + //建立隐藏档案 + String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1); + + pat = patientsService.findOnePatientById(id); + } + else + { + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛"); + } + } + } + + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); + PatientBaseResult patientBaseResult = new PatientBaseResult(); + if (null != pat) { + patientBaseResult.convert(pat); + } + patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); + patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); + + map.put("patientInfo",patientBaseResult); + + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setParentId(parentId); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + + + + List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) + { + Map result = new HashMap<>(); + SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); + + result.put("id",sieveApply.getId()); + result.put("parentId",sieveApply.getParentId()); + + result.put("checkItem",sieveApply.getCheckItem()); + result.put("guide",sieveApply.getGuide()); + result.put("checkDate",sieveApply.getCheckDate()); + result.put("applyDoctor",sieveApply.getApplyDoctor()); + result.put("hospitalId",sieveApply.getHospitalId()); + result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime())); + result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth())); + result.put("weight",sieveApply.getWeight()); + result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); + result.put("number",sieveApply.getNumber()); + result.put("collectionDoctorId",sieveApply.getCollectionDoctorId()); + result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); + result.put("crl",sieveApply.getCrl()); + result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); + result.put("historyBirth",StringUtils.isNotEmpty(sieveApply.getHistoryBirth()) ? JsonUtil.getMap(sieveApply.getHistoryBirth()) : new HashMap<>()); + result.put("pastHistory",sieveApply.getPastHistory()); + result.put("applyHospitalId",sieveApply.getApplyHospitalId()); + result.put("sendDoctor",sieveApply.getSendDoctor()); + result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); + + result.put("sieveApplyInfo",result); + + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 358ebd6..2714ff9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.SieveApplyOrderModel; +import java.util.Date; import java.util.List; import java.util.Map; @@ -68,6 +69,12 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert