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 95ae7ab..f2d11a2 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 @@ -339,7 +339,7 @@ public class AntenatalExaminationFacade { addTrackDownInfo(userId, patients); } //自动数据处理 - updateAutoData(model, hospitalId); + updateAutoData(model, antExAddRequest,hospitalId); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -349,7 +349,7 @@ public class AntenatalExaminationFacade { * @param antExamModel * @param hospitalId */ - public void updateAutoData(final AntenatalExaminationModel antExamModel, final String hospitalId) { + public void updateAutoData(final AntenatalExaminationModel antExamModel,final AntExAddRequest antExAddRequest, final String hospitalId) { commonThreadPool.execute(new Runnable() { @Override public void run() { @@ -358,6 +358,7 @@ public class AntenatalExaminationFacade { if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) { Patients patients = patientsService.findOnePatientById(antExamModel.getParentId()); if (patients != null) { + patients.setVcCardNo(antExAddRequest.getVcCardNo()); //发送推送消息 patients.setSendMsgTime(new Date()); patientsService.updatePatient(patients); @@ -816,6 +817,8 @@ public class AntenatalExaminationFacade { if (excAddRequest.getIsSendMsg()) { patients.setSendMsgTime(new Date()); } + //本院就诊卡号 + patients.setVcCardNo(excAddRequest.getVcCardNo()); patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients); @@ -2321,18 +2324,21 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); - } else if (StringUtils.isNotEmpty(vcCardNo)) { + } else if (StringUtils.isNotEmpty(id)) { + patientsQuery.setId(id); + } else if (StringUtils.isNotEmpty(pid)) { + patientsQuery.setPid(pid); + } + + if (StringUtils.isNotEmpty(vcCardNo)) { //德州市妇幼保健院医院通过(就诊卡号、银行卡号,社保卡号) 查询出对应的用过的卡号 add lqy if ("1000000114".equals(hospitalId)) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } else { patientsQuery.setVcCardNo(vcCardNo); } - } else if (StringUtils.isNotEmpty(id)) { - patientsQuery.setId(id); - } else if (StringUtils.isNotEmpty(pid)) { - patientsQuery.setPid(pid); } + patientsQuery.setType(type); patientsQuery.setHospitalList(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); @@ -2728,7 +2734,6 @@ public class AntenatalExaminationFacade { Assert.notNull(examinationModel, "id不存在."); AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult(); antenatalExaminationResult.convertToResult(examinationModel); - try { //筛查结果 if (CollectionUtils.isNotEmpty(examinationModel.getScreenResult())) { @@ -2765,7 +2770,7 @@ public class AntenatalExaminationFacade { if (null != data) { data = patients.getLastMenses(); } - + antenatalExaminationResult.setVcCardNo(patients.getVcCardNo()); String doctorId = examinationModel.getCheckDoctor(); if (StringUtils.isNotEmpty(doctorId)) { Users users = usersService.getUsers(Integer.valueOf(doctorId)); @@ -2838,6 +2843,7 @@ public class AntenatalExaminationFacade { mensDay += patients.getMensEndDay(); } antexChuResult.setMensDay(mensDay); + antexChuResult.setVcCardNo(patients.getVcCardNo()); } antexChuResult.convertToResult(antExChuModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 12f4789..423c3c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1199,6 +1199,7 @@ public class ViewFacade { Map map = new HashMap<>(); /***新增字段***/ map.put("ttita", data.getTtita()); + map.put("vcCardNo", patients.getVcCardNo()); map.put("totalThy", data.getTotalThy()); map.put("ftita", data.getFtita()); map.put("freeThy", data.getFreeThy()); @@ -1916,6 +1917,7 @@ public class ViewFacade { Map map = new HashMap<>(); /***新增字段***/ + map.put("vcCardNo", patients.getVcCardNo()); map.put("ttita", data.getTtita()); map.put("totalThy", data.getTotalThy()); map.put("ftita", data.getFtita()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 8f126ea..124ea50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -33,7 +33,7 @@ public class AntExAddRequest implements IBasicRequestConvert mHighRiskReason; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 0af052b..92a0029 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -31,6 +31,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { // 是否需要发送 private boolean isSendMsg; + private String vcCardNo; + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; @@ -345,6 +347,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { //浮肿 private String edema; + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + public boolean getIsSendMsg() { return isSendMsg; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 5b2cbbb..04fd433 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -55,6 +55,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert> getScreenResult() { return screenResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index a9abc90..ead53e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -25,6 +25,15 @@ public class AntexChuResult { //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项 private String lisCheckItems; + private String vcCardNo; + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } public String getLisCheckItems() { return lisCheckItems; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 92dfc9a..e255232 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -69,10 +69,20 @@ public class AntexListResult { private String lastSendMsg; //高危诊断是否开启 0停用,1启用 private String enableConfig = "0"; + //医院ID + private String hospitalId; // + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public String getLastSendMsg() { return lastSendMsg; } @@ -300,6 +310,7 @@ public class AntexListResult { if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } + setHospitalId(patients.getHospitalId()); setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); setName(patients.getUsername()); setPhone(patients.getPhone());