jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5f1bedac60773e9af98c5d42471c4c111e815c6a

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

孕产-临时血糖/临时血压打印状态及筛选

Showing 11 changed files with 57 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java View file @ 5f1beda
... ... @@ -29,6 +29,18 @@
29 29 private Integer yn;
30 30 private String temporaryUserId;
31 31  
  32 + /**
  33 + * 是否打印过报告 1：已打印 2：未已打印
  34 + */
  35 + private Integer isPrint ;
  36 +
  37 + public Integer getIsPrint() {
  38 + return isPrint;
  39 + }
  40 +
  41 + public void setIsPrint(Integer isPrint) {
  42 + this.isPrint = isPrint;
  43 + }
32 44 public String getTemporaryUserId() {
33 45 return temporaryUserId;
34 46 }
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java View file @ 5f1beda
... ... @@ -49,6 +49,18 @@
49 49  
50 50 private String doctorId;
51 51  
  52 + /**
  53 + * 是否打印过报告 1：已打印 2：未已打印
  54 + */
  55 + private Integer isPrint ;
  56 +
  57 + public Integer getIsPrint() {
  58 + return isPrint;
  59 + }
  60 +
  61 + public void setIsPrint(Integer isPrint) {
  62 + this.isPrint = isPrint;
  63 + }
52 64 public String getDoctorId() {
53 65 return doctorId;
54 66 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 5f1beda
... ... @@ -338,7 +338,7 @@
338 338 /**
339 339 * 修改打印状态
340 340 * @param id id
341   - * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理5:临时体重管理
  341 + * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理5:临时体重管理6:临时血糖管理7：临时血压管理
342 342 * @return
343 343 */
344 344 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java View file @ 5f1beda
... ... @@ -56,8 +56,8 @@
56 56 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
57 57 @TokenRequired
58 58 @ResponseBody
59   - public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit, HttpServletRequest request) {
60   - return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit, getUserId(request));
  59 + public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit,Integer isPrint, HttpServletRequest request) {
  60 + return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit,isPrint, getUserId(request));
61 61 }
62 62  
63 63 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ 5f1beda
... ... @@ -50,8 +50,8 @@
50 50 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
51 51 @TokenRequired
52 52 @ResponseBody
53   - public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) {
54   - return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request));
  53 + public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, Integer isPrint,HttpServletRequest request) {
  54 + return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, isPrint, getUserId(request));
55 55 }
56 56  
57 57 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java View file @ 5f1beda
... ... @@ -14,7 +14,7 @@
14 14  
15 15 /* BaseResponse queryOne(String id);
16 16 */
17   - BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
  17 + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId);
18 18  
19 19  
20 20 BaseResponse info(String id, Date startDate);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java View file @ 5f1beda
... ... @@ -13,7 +13,7 @@
13 13  
14 14 /*BaseResponse queryOne(String id);
15 15 */
16   - BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
  16 + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer isPrint,Integer userId);
17 17  
18 18 BaseResponse info(String parentId, Integer type, Date time);
19 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 5f1beda
... ... @@ -109,6 +109,9 @@
109 109 if (one != null) {
110 110 one.setModified(new Date());
111 111 one.setBloodSugar(bloodSugar.getBloodSugar());
  112 + if(null!=bloodSugar.getIsPrint()){
  113 + one.setIsPrint(bloodSugar.getIsPrint());
  114 + }
112 115 bloodSugarService.update(one);
113 116 return RespBuilder.buildSuccess(one.getId());
114 117 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 5f1beda
... ... @@ -4243,6 +4243,16 @@
4243 4243 temporaryWeightModel.setIsPrint(1);
4244 4244 temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("id").is(id)),temporaryWeightModel);
4245 4245 break;
  4246 + case 6:
  4247 + Update up = new Update();
  4248 + up.set("isPrint", 1);
  4249 + mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), up, TemporaryBloodSugar.class);
  4250 + break;
  4251 + case 7:
  4252 + Update up2 = new Update();
  4253 + up2.set("isPrint", 1);
  4254 + mongoTemplate.updateMulti(Query.query(Criteria.where("id").is(id)), up2, TemporaryBloodModel.class);
  4255 + break;
4246 4256 }
4247 4257  
4248 4258 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ 5f1beda
... ... @@ -151,7 +151,7 @@
151 151 }
152 152 */
153 153 @Override
154   - public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
  154 + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId) {
155 155 boolean flag = false;
156 156 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
157 157 Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
... ... @@ -182,6 +182,9 @@
182 182 }
183 183 criteria.and("temporaryUserId").in(ids);
184 184 }
  185 + if(null!=isPrint){
  186 + criteria.and("isPrint").is(isPrint);
  187 + }
185 188 PageResult pageResult = findMongoPage(TemporaryBloodModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
186 189 List<TemporaryBloodModel> bloodPressures = (List<TemporaryBloodModel>) pageResult.getGrid();
187 190 List<Map<String, Object>> restList = new ArrayList<>();
... ... @@ -216,6 +219,7 @@
216 219 temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight());
217 220 temp.put("height", temporaryUser.getBeforeHeight() == null ? "" : temporaryUser.getBeforeHeight());
218 221 temp.put("bregmatic", temporaryUser.getBregmatic() == null ? "" : temporaryUser.getBregmatic());
  222 + temp.put("isPrint", null==bloodPressure.getIsPrint()?"":bloodPressure.getIsPrint()==1?"已打印":"未打印");
219 223 }
220 224 restList.add(temp);
221 225 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ 5f1beda
... ... @@ -74,6 +74,9 @@
74 74 if (StringUtils.isNotEmpty(doctorId)) {
75 75 one.setDoctorId(doctorId);
76 76 }
  77 + if(null!=bloodSugar.getIsPrint()){
  78 + one.setIsPrint(bloodSugar.getIsPrint());
  79 + }
77 80 temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one);
78 81 return RespBuilder.buildSuccess(one.getId());
79 82 }
... ... @@ -153,7 +156,7 @@
153 156 }
154 157 */
155 158 @Override
156   - public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
  159 + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit,Integer isPrint, Integer userId) {
157 160 boolean flag = false;
158 161 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
159 162 Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
... ... @@ -184,6 +187,9 @@
184 187 }
185 188 criteria.and("temporaryUserId").in(ids);
186 189 }
  190 + if(null!=isPrint){
  191 + criteria.and("isPrint").is(isPrint);
  192 + }
187 193 PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
188 194 List<TemporaryBloodSugar> bloodSugars = (List<TemporaryBloodSugar>) pageResult.getGrid();
189 195 List<Map<String, Object>> restList = new ArrayList<>();
... ... @@ -216,6 +222,7 @@
216 222 temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
217 223 temp.put("bregmatic", temporaryUser.getBregmatic());
218 224 temp.put("cardNo", temporaryUser.getCardID());
  225 + temp.put("isPrint", null==bloodSugar.getIsPrint()?"":bloodSugar.getIsPrint()==1?"已打印":"未打印");
219 226 }
220 227 restList.add(temp);
221 228 }