From d05df80b85f0338af14f0ac4e8c53c5e27b371f3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 28 Apr 2022 16:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=AA=8C=E4=BF=A1=E6=81=AFupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/service/AuthenticationService.java | 4 ++-- .../src/main/java/com/lyms/platform/pojo/Patients.java | 12 ------------ .../web/controller/AuthenticationController.java | 13 ------------- .../operate/web/facade/AuthenticationFacade.java | 18 ++++++------------ .../operate/web/facade/BookbuildingFacade.java | 12 ++++++++---- .../operate/web/result/PregnantInfoResult.java | 13 +++++++++++++ 6 files changed, 29 insertions(+), 43 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AuthenticationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AuthenticationService.java index 08575ba..cb85c84 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AuthenticationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AuthenticationService.java @@ -68,9 +68,9 @@ public class AuthenticationService extends BaseMongoDAOImpl { } - public Authentication queryById(String id) { + public Authentication queryById(String pid) { AuthenticationQuery tQuery = new AuthenticationQuery(); - tQuery.setId(id); + tQuery.setPid(pid); MongoQuery query = tQuery.convertToQuery(); return findOne(query.convertToMongoQuery()); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 7c8f313..c4880a9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -438,18 +438,6 @@ public class Patients extends BaseModel { //秦皇岛-有居住证 填写字段 private String liveCardNo; - /** - * 建档身份信息核验 - */ - private Authentication verifyInfo; - - public Authentication getVerifyInfo() { - return verifyInfo; - } - - public void setVerifyInfo(Authentication verifyInfo) { - this.verifyInfo = verifyInfo; - } public String getHprovinceId() { return hprovinceId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AuthenticationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AuthenticationController.java index d2dfab8..624e187 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AuthenticationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AuthenticationController.java @@ -59,19 +59,6 @@ public class AuthenticationController extends BaseController { } /** - * 编辑数据获取/单个记录 - * @param id - * @return - */ - @ResponseBody - @TokenRequired - @RequestMapping(value = "/queryUpDate",method = RequestMethod.GET) - public BaseResponse queryUpDate(String id) { - - return authenticationFacade.queryUpDate(id); - } - - /** * 管理列表 * @param ModelQuery * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AuthenticationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AuthenticationFacade.java index 9f1f9d4..2372daf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AuthenticationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AuthenticationFacade.java @@ -146,26 +146,20 @@ public class AuthenticationFacade { } /** - * 编辑数据获取/单个记录 - * @param id + * 编辑档案数据获取 核验信息 + * @param pid * @return */ - public BaseResponse queryUpDate(String id) { - BaseObjectResponse br = new BaseObjectResponse(); + public Authentication queryUpDate(String pid) { Authentication model = null; try { - model = authenticationService.queryById(id); + model = authenticationService.queryById(pid); } catch (Exception e) { e.printStackTrace(); - br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - br.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); - return br; + return model; } - br.setErrorcode(ErrorCodeConstants.SUCCESS); - br.setData(model); - br.setErrormsg("成功"); - return br; + return model; } /** 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 ccedbbc..3b8d210 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 @@ -361,7 +361,9 @@ public class BookbuildingFacade { /** 建档核验模块 **/ //建档成功后保存核验结果 if(StringUtils.isNotEmpty(p.getId())){ - authenticationFacade.addOrUpDate(p.getVerifyInfo(), userId); + yunRequest.getVerifyInfo().setPid(p.getId()); + yunRequest.getVerifyInfo().setVerifyDate(p.getBookbuildingDate()); + authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId); } /**------------**/ /** 孕妇建档后把所有以前未使用的优惠券作废 */ @@ -1243,8 +1245,8 @@ public class BookbuildingFacade { /** 建档核验模块 **/ //建档修改成功后修改核验结果 - if(null != patient.getVerifyInfo() && StringUtils.isNotEmpty(patient.getVerifyInfo().getId())){ - authenticationFacade.addOrUpDate(patient.getVerifyInfo(), userId); + if(null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(yunRequest.getVerifyInfo().getId())){ + authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId); } /**------------**/ //如果当前是建档医院,那么需要修改其他非建档医院的数据 @@ -2047,7 +2049,6 @@ public class BookbuildingFacade { patient.setPatientVerifName(yunRequest.getPatientVerifName()); patient.setHusVerifType(yunRequest.getHusVerifType()); patient.setLiveCardNo(yunRequest.getLiveCardNo()); - patient.setVerifyInfo(yunRequest.getVerifyInfo()); return patient; } @@ -2098,6 +2099,9 @@ public class BookbuildingFacade { BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); + //核验信息系 + final Authentication authentication = authenticationFacade.queryUpDate(id); + result.setVerifyInfo(authentication); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index b674b58..96f302d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import com.lyms.platform.pojo.Authentication; import com.lyms.platform.pojo.FilePathModel; import java.util.List; @@ -461,6 +462,18 @@ public class PregnantInfoResult { */ private String villageRegister; + /** + * 建档身份信息核验 + */ + private Authentication verifyInfo; + + public Authentication getVerifyInfo() { + return verifyInfo; + } + + public void setVerifyInfo(Authentication verifyInfo) { + this.verifyInfo = verifyInfo; + } public String getVillageRegister() { return villageRegister; } -- 1.8.3.1