From ad8e05d5965d67f349b41cb1f739c6327bf06a5b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 30 Oct 2017 11:39:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/SieveController.java | 2 +- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 8 +++++--- .../lyms/platform/operate/web/facade/PostReviewFacade.java | 9 ++------- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 12 ++++++++---- 4 files changed, 16 insertions(+), 15 deletions(-) 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 6df3dd7..6a1c2ec 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 @@ -71,7 +71,7 @@ public class SieveController extends BaseController { @RequestMapping(value = "/cqsieve",method = RequestMethod.POST) public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest/*,loginState.getId()*/); + return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 2f95ab8..a096ae3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -185,7 +185,6 @@ public class ApplyOrderFacade { patients.setExpVip(0); patients.setEnable("0"); id = patientsService.addPatient(patients).getId(); - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊"); } else { Patients patients1 = patientsList.get(0); @@ -371,9 +370,11 @@ public class ApplyOrderFacade { sieveApplyOrderModel1.setId(str); sieveApplyOrderModel1.setModified(new Date()); sieveApplyOrderModel1.setStatus(1); + SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery2.setId(str); + List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); applyOrderService.updateSieve(sieveApplyOrderModel1); - -// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), ,sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); } } SieveQuery sieveQuery = new SieveQuery(); @@ -390,6 +391,7 @@ public class ApplyOrderFacade { sieveModel.setDueWeek(days); SieveService.handOrder(sieveModel); sieveService.updateOneChanQianDiaSieve(sieveModel); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "更新待产晒"); } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 7329d46..16823ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -199,14 +199,9 @@ public class PostReviewFacade { patientsService.updatePatient(patients); patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(), patients.getId()); - - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setId(postReviewRequest.getId()); - matDeliverQuery.setYn(YnEnums.YES.getId()); - - List list = matDeliverService.query(matDeliverQuery); + PostReviewModel postReviewModelBefore = postReviewService.findOneById(postReviewRequest.getId()); postReviewService.updatePostById(postReviewModel, postReviewRequest.getId()); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0),postReviewModel, OptActionEnums.UPDATE.getId(), "修改产后复查"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), postReviewModelBefore,postReviewModel, OptActionEnums.UPDATE.getId(), "修改产后复查"); syncMaster(patients.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 256600d..2832046 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 @@ -85,14 +85,14 @@ public class SieveFacade { SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setId(sieveAddRequest.getId()); -// List list = sieveService.queryListSieveResult(sieveResultQuery); + List list = sieveService.queryListSieveResult(sieveResultQuery); // sieveService.update(sieveResultQuery.convertToQuery(), sieveResultModel); -// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital),list.get(0), sieveResultModel, OptActionEnums.UPDATE.getId(), "修改产前筛查"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), sieveResultModel, OptActionEnums.UPDATE.getId(), "修改产筛结果"); } else { sieveService.addSieve(sieveResultModel); -// operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产前筛查"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产筛结果"); } SieveQuery sieveQuery = new SieveQuery(); @@ -179,7 +179,10 @@ public class SieveFacade { * @param chanQianDiaAddRequest * @return */ - public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest) { + public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest,Integer userId) { + + String hospital = autoMatchFacade.getHospitalId(userId); + SieveModel sieveModel = new SieveModel(); sieveModel.setId(chanQianDiaAddRequest.getId()); sieveModel.setPublishName(chanQianDiaAddRequest.getPublishName()); @@ -190,6 +193,7 @@ public class SieveFacade { sieveModel.setStatus(4); sieveModel.setCqStatus(1); sieveService.updateOneChanQianDiaSieve(sieveModel); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveModel, OptActionEnums.ADD.getId(), "产前诊断"); SieveModel sieveModel1 = sieveService.findOneById(chanQianDiaAddRequest.getId()); SieveService.handOrder(sieveModel1); -- 1.8.3.1