jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ad8e05d5965d67f349b41cb1f739c6327bf06a5b

Authored by liquanyu
1 parent e6909d9c9c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

操作日志

Showing 4 changed files with 16 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ ad8e05d
... ... @@ -71,7 +71,7 @@
71 71 @RequestMapping(value = "/cqsieve",method = RequestMethod.POST)
72 72 public BaseResponse addOneChanQianDiaSieve(@RequestBody @Valid ChanQianDiaAddRequest chanQianDiaAddRequest,HttpServletRequest request) {
73 73 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
74   - return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest/*,loginState.getId()*/);
  74 + return sieveFacade.addOneChanQianDiaSieve(chanQianDiaAddRequest,loginState.getId());
75 75 }
76 76  
77 77 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ ad8e05d
... ... @@ -185,7 +185,6 @@
185 185 patients.setExpVip(0);
186 186 patients.setEnable("0");
187 187 id = patientsService.addPatient(patients).getId();
188   -
189 188 operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊");
190 189 } else {
191 190 Patients patients1 = patientsList.get(0);
192 191  
... ... @@ -371,9 +370,11 @@
371 370 sieveApplyOrderModel1.setId(str);
372 371 sieveApplyOrderModel1.setModified(new Date());
373 372 sieveApplyOrderModel1.setStatus(1);
  373 + SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
  374 + sieveApplyOrderQuery2.setId(str);
  375 + List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
374 376 applyOrderService.updateSieve(sieveApplyOrderModel1);
375   -
376   -// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), ,sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
  377 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
377 378 }
378 379 }
379 380 SieveQuery sieveQuery = new SieveQuery();
... ... @@ -390,6 +391,7 @@
390 391 sieveModel.setDueWeek(days);
391 392 SieveService.handOrder(sieveModel);
392 393 sieveService.updateOneChanQianDiaSieve(sieveModel);
  394 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "更新待产晒");
393 395 }
394 396 }
395 397 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ ad8e05d
... ... @@ -199,14 +199,9 @@
199 199 patientsService.updatePatient(patients);
200 200 patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(), patients.getId());
201 201  
202   -
203   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
204   - matDeliverQuery.setId(postReviewRequest.getId());
205   - matDeliverQuery.setYn(YnEnums.YES.getId());
206   -
207   - List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
  202 + PostReviewModel postReviewModelBefore = postReviewService.findOneById(postReviewRequest.getId());
208 203 postReviewService.updatePostById(postReviewModel, postReviewRequest.getId());
209   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0),postReviewModel, OptActionEnums.UPDATE.getId(), "修改产后复查");
  204 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), postReviewModelBefore,postReviewModel, OptActionEnums.UPDATE.getId(), "修改产后复查");
210 205  
211 206 syncMaster(patients.getId());
212 207 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ ad8e05d
... ... @@ -85,14 +85,14 @@
85 85 SieveResultQuery sieveResultQuery = new SieveResultQuery();
86 86 sieveResultQuery.setId(sieveAddRequest.getId());
87 87  
88   -// List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
  88 + List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
89 89 //
90 90 sieveService.update(sieveResultQuery.convertToQuery(), sieveResultModel);
91   -// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital),list.get(0), sieveResultModel, OptActionEnums.UPDATE.getId(), "修改产前筛查");
  91 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), sieveResultModel, OptActionEnums.UPDATE.getId(), "修改产筛结果");
92 92 } else {
93 93  
94 94 sieveService.addSieve(sieveResultModel);
95   -// operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产前筛查");
  95 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产筛结果");
96 96 }
97 97  
98 98 SieveQuery sieveQuery = new SieveQuery();
... ... @@ -179,7 +179,10 @@
179 179 * @param chanQianDiaAddRequest
180 180 * @return
181 181 */
182   - public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest) {
  182 + public BaseResponse addOneChanQianDiaSieve(ChanQianDiaAddRequest chanQianDiaAddRequest,Integer userId) {
  183 +
  184 + String hospital = autoMatchFacade.getHospitalId(userId);
  185 +
183 186 SieveModel sieveModel = new SieveModel();
184 187 sieveModel.setId(chanQianDiaAddRequest.getId());
185 188 sieveModel.setPublishName(chanQianDiaAddRequest.getPublishName());
... ... @@ -190,6 +193,7 @@
190 193 sieveModel.setStatus(4);
191 194 sieveModel.setCqStatus(1);
192 195 sieveService.updateOneChanQianDiaSieve(sieveModel);
  196 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveModel, OptActionEnums.ADD.getId(), "产前诊断");
193 197  
194 198 SieveModel sieveModel1 = sieveService.findOneById(chanQianDiaAddRequest.getId());
195 199 SieveService.handOrder(sieveModel1);