From 5f1bedac60773e9af98c5d42471c4c111e815c6a Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 11 May 2022 08:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7-=E4=B8=B4=E6=97=B6=E8=A1=80?= =?UTF-8?q?=E7=B3=96/=E4=B8=B4=E6=97=B6=E8=A1=80=E5=8E=8B=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=8A=B6=E6=80=81=E5=8F=8A=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/TemporaryBloodModel.java | 12 ++++++++++++ .../java/com/lyms/platform/pojo/TemporaryBloodSugar.java | 12 ++++++++++++ .../operate/web/controller/PatientWeightController.java | 2 +- .../operate/web/controller/TemporaryBloodController.java | 4 ++-- .../web/controller/TemporaryBloodSugarController.java | 4 ++-- .../platform/operate/web/service/ITemporaryBloodService.java | 2 +- .../operate/web/service/ITemporaryBloodSugarService.java | 2 +- .../operate/web/service/impl/BloodSugarServiceImpl.java | 3 +++ .../operate/web/service/impl/PatientWeightServiceImpl.java | 10 ++++++++++ .../operate/web/service/impl/TemporaryBloodServiceImpl.java | 6 +++++- .../web/service/impl/TemporaryBloodSugarServiceImpl.java | 9 ++++++++- 11 files changed, 57 insertions(+), 9 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java index 3ba7a30..1a5ce32 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java @@ -29,6 +29,18 @@ public class TemporaryBloodModel extends BaseModel { private Integer yn; private String temporaryUserId; + /** + * 是否打印过报告 1：已打印 2：未已打印 + */ + private Integer isPrint ; + + public Integer getIsPrint() { + return isPrint; + } + + public void setIsPrint(Integer isPrint) { + this.isPrint = isPrint; + } public String getTemporaryUserId() { return temporaryUserId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java index 04f1bc3..8fbae08 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java @@ -49,6 +49,18 @@ public class TemporaryBloodSugar extends BaseModel { private String doctorId; + /** + * 是否打印过报告 1：已打印 2：未已打印 + */ + private Integer isPrint ; + + public Integer getIsPrint() { + return isPrint; + } + + public void setIsPrint(Integer isPrint) { + this.isPrint = isPrint; + } public String getDoctorId() { return doctorId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 8a5fb18..51999cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -338,7 +338,7 @@ public class PatientWeightController extends BaseController { /** * 修改打印状态 * @param id id - * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理5:临时体重管理 + * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理5:临时体重管理6:临时血糖管理7：临时血压管理 * @return */ @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java index 20bd615..d0973cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java @@ -56,8 +56,8 @@ public class TemporaryBloodController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit, HttpServletRequest request) { - return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit,Integer isPrint, HttpServletRequest request) { + return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit,isPrint, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index 9ce8b3e..fd2a3ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -50,8 +50,8 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) { - return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, Integer isPrint,HttpServletRequest request) { + return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, isPrint, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java index 4039a90..7649b37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java @@ -14,7 +14,7 @@ public interface ITemporaryBloodService extends IBaseService { /* BaseResponse queryOne(String id); */ - BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId); BaseResponse info(String id, Date startDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java index 3614e3a..d2bd4d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java @@ -13,7 +13,7 @@ public interface ITemporaryBloodSugarService extends IBaseService { /*BaseResponse queryOne(String id); */ - BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer isPrint,Integer userId); BaseResponse info(String parentId, Integer type, Date time); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 3bf3a11..47dc5d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -109,6 +109,9 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if (one != null) { one.setModified(new Date()); one.setBloodSugar(bloodSugar.getBloodSugar()); + if(null!=bloodSugar.getIsPrint()){ + one.setIsPrint(bloodSugar.getIsPrint()); + } bloodSugarService.update(one); return RespBuilder.buildSuccess(one.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 6291c1d..20fe7cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -4243,6 +4243,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient temporaryWeightModel.setIsPrint(1); temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("id").is(id)),temporaryWeightModel); break; + case 6: + Update up = new Update(); + up.set("isPrint", 1); + mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), up, TemporaryBloodSugar.class); + break; + case 7: + Update up2 = new Update(); + up2.set("isPrint", 1); + mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), up2, TemporaryBloodModel.class); + break; } } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index ca002cb..ed6f1dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -151,7 +151,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } */ @Override - public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital); @@ -182,6 +182,9 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } criteria.and("temporaryUserId").in(ids); } + if(null!=isPrint){ + criteria.and("isPrint").is(isPrint); + } PageResult pageResult = findMongoPage(TemporaryBloodModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List bloodPressures = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); @@ -216,6 +219,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); temp.put("height", temporaryUser.getBeforeHeight() == null ? "" : temporaryUser.getBeforeHeight()); temp.put("bregmatic", temporaryUser.getBregmatic() == null ? "" : temporaryUser.getBregmatic()); + temp.put("isPrint", null==bloodPressure.getIsPrint()?"":bloodPressure.getIsPrint()==1?"已打印":"未打印"); } restList.add(temp); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 0ce9f19..9925d3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -74,6 +74,9 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I if (StringUtils.isNotEmpty(doctorId)) { one.setDoctorId(doctorId); } + if(null!=bloodSugar.getIsPrint()){ + one.setIsPrint(bloodSugar.getIsPrint()); + } temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one); return RespBuilder.buildSuccess(one.getId()); } @@ -153,7 +156,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } */ @Override - public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital); @@ -184,6 +187,9 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } criteria.and("temporaryUserId").in(ids); } + if(null!=isPrint){ + criteria.and("isPrint").is(isPrint); + } PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List bloodSugars = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); @@ -216,6 +222,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); temp.put("bregmatic", temporaryUser.getBregmatic()); temp.put("cardNo", temporaryUser.getCardID()); + temp.put("isPrint", null==bloodSugar.getIsPrint()?"":bloodSugar.getIsPrint()==1?"已打印":"未打印"); } restList.add(temp); } -- 1.8.3.1