From 4a3a1125b5f66a9efda8b1d73f9d27228520adb7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 19 Dec 2017 17:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/TempController.java | 4 ++-- .../com/lyms/platform/operate/web/facade/TempFacade.java | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java index b66e2e2..e24d3e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TempController.java @@ -73,9 +73,9 @@ public class TempController extends BaseController { @TokenRequired @RequestMapping(value = "/add",method = RequestMethod.POST) @ResponseBody - public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest,HttpServletRequest request) { + public BaseResponse addOnceTemp(@Valid TempAddRequest tempRequest,boolean flag,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return tempFacade.addOrUpdateOneTemp(tempRequest,loginState.getId()); + return tempFacade.addOrUpdateOneTemp(tempRequest,loginState.getId(),flag); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java index bcc8205..97e9dfe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java @@ -65,7 +65,7 @@ public class TempFacade { @Autowired private MongoTemplate mongoTemplate; - public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId) { + public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId, boolean flag) { Assert.notNull(addRequest, "请求为空."); String hospital = autoMatchFacade.getHospitalId(userId); String parentId = mongoUtil.doHidePatient(addRequest.getParentId(), hospital); @@ -74,7 +74,7 @@ public class TempFacade { tempQuery.setYn(YnEnums.YES.getId()); Patients patients = patientsService.findOnePatientById(parentId); - List list1 =new ArrayList(); + List list1 = new ArrayList(); list1.add(patients.getPid()); tempQuery.setpIds(list1); ArrayList list = new ArrayList(); @@ -100,7 +100,13 @@ public class TempFacade { data.put(DateUtil.getYyyyMmDd(new Date()), Double.valueOf(addRequest.getTemp())); tempModel.setTempList(data); tempModel.setNow(addRequest.getTemp()); - tempService.addOneTemp(tempModel); + tempModel.setCreated(new Date()); + tempModel.setModified(new Date()); + if (flag) { + mongoTemplate.insert(tempModel); + } else { + tempService.addOneTemp(tempModel); + } } return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } @@ -215,7 +221,7 @@ public class TempFacade { map.put("errorcode", ErrorCodeConstants.SUCCESS); map.put("errormsg", "成功"); if (CollectionUtils.isNotEmpty(tem)) { - LinkedHashMap data1=new LinkedHashMap<>(); + LinkedHashMap data1 = new LinkedHashMap<>(); for (TempModel temp : tem) { LinkedHashMap data = temp.getTempList(); if (null == data || data.isEmpty()) { -- 1.8.3.1