jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b218af3d324013a420d820ae32c4dc10159e5fb3

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

孕产-血压管理/儿童膳食营养管理打印筛选及增加状态

Showing 9 changed files with 71 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ b218af3
... ... @@ -131,7 +131,18 @@
131 131  
132 132 //秦皇岛膳食定制
133 133 private List<Map<String,Integer>> diets;
  134 + /**
  135 + * 是否打印过报告 1：已打印 2：未已打印
  136 + */
  137 + private Integer isPrint ;
134 138  
  139 + public Integer getIsPrint() {
  140 + return isPrint;
  141 + }
  142 +
  143 + public void setIsPrint(Integer isPrint) {
  144 + this.isPrint = isPrint;
  145 + }
135 146  
136 147 public List<Map<String,Integer>> getDiets() {
137 148 return diets;
platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java View file @ b218af3
... ... @@ -59,6 +59,19 @@
59 59  
60 60 private String temporaryUserId;
61 61  
  62 + /**
  63 + * 是否打印过报告 1：已打印 2：未已打印
  64 + */
  65 + private Integer isPrint ;
  66 +
  67 + public Integer getIsPrint() {
  68 + return isPrint;
  69 + }
  70 +
  71 + public void setIsPrint(Integer isPrint) {
  72 + this.isPrint = isPrint;
  73 + }
  74 +
62 75 public String getTemporaryUserId() {
63 76 return temporaryUserId;
64 77 }
platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionQuery.java View file @ b218af3
... ... @@ -38,7 +38,19 @@
38 38  
39 39  
40 40 private List<String> ids;
  41 + /**
  42 + * 是否打印过报告 1：已打印 2：未已打印
  43 + */
  44 + private Integer isPrint ;
41 45  
  46 + public Integer getIsPrint() {
  47 + return isPrint;
  48 + }
  49 +
  50 + public void setIsPrint(Integer isPrint) {
  51 + this.isPrint = isPrint;
  52 + }
  53 +
42 54 public List<String> getIds() {
43 55 return ids;
44 56 }
... ... @@ -73,6 +85,9 @@
73 85  
74 86 if (CollectionUtils.isNotEmpty(ids)) {
75 87 condition = condition.and("id", ids, MongoOper.IN);
  88 + }
  89 + if (null!=isPrint) {
  90 + condition = condition.and("isPrint", isPrint, MongoOper.IS);
76 91 }
77 92  
78 93  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java View file @ b218af3
... ... @@ -74,8 +74,9 @@
74 74 @RequestParam(required = false) String interpretDoctorId,
75 75 @RequestParam(required = false) String settleStatus,
76 76 @RequestParam(required = false) String babyId,
  77 + @RequestParam(required = false) Integer isPrint,
77 78 HttpServletRequest request) {
78   - return babyNutritionFacade.queryBabyNutritionList(babyId,page, limit, queryNo, vcCardNo, babyName, getUserId(request), recordTime, interpretDoctorId, settleStatus);
  79 + return babyNutritionFacade.queryBabyNutritionList(babyId,page, limit, queryNo, vcCardNo, babyName, getUserId(request), recordTime, interpretDoctorId, settleStatus,isPrint);
79 80 }
80 81  
81 82  
... ... @@ -94,7 +95,7 @@
94 95 @RequestParam(required = false) String babyId,
95 96 HttpServletRequest request) {
96 97 return babyNutritionFacade.queryBabyNutritionList(babyId,page, limit, null, null, null,null,
97   - null, null, null);
  98 + null, null, null,null);
98 99 }
99 100  
100 101 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ b218af3
... ... @@ -45,8 +45,8 @@
45 45 @RequestMapping(method = RequestMethod.GET)
46 46 @TokenRequired
47 47 public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age,
48   - Integer page, Integer limit, HttpServletRequest request,String isAll) {
49   - return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request), isAll);
  48 + Integer page, Integer limit,Integer isPrint, HttpServletRequest request,String isAll) {
  49 + return bloodPressureService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit,isPrint, getUserId(request), isAll);
50 50 }
51 51  
52 52 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ b218af3
... ... @@ -246,7 +246,7 @@
246 246 * @return
247 247 */
248 248 public BaseResponse queryBabyNutritionList(String babyId,Integer page, Integer limit, String queryNo, String vcCardNo,
249   - String babyName, Integer userId, String recordTime, String interpretDoctorId, String settleStatus) {
  249 + String babyName, Integer userId, String recordTime, String interpretDoctorId, String settleStatus,Integer isPrint) {
250 250 String hospitalId = null;
251 251 if (userId != null)
252 252 {
... ... @@ -323,6 +323,10 @@
323 323 }
324 324 }
325 325 babyQuery.setNeed("true");
  326 +
  327 + if(null!=isPrint){
  328 + babyQuery.setIsPrint(isPrint);
  329 + }
326 330 List<BabyNutritionModel> models = babyNutritionService.queryBabyNutritions(babyQuery, "nutritiTime", Sort.Direction.DESC);
327 331  
328 332 if (CollectionUtils.isNotEmpty(models)) {
... ... @@ -403,7 +407,7 @@
403 407 }
404 408 map.put("interpretDoctorName", interpretDoctorName);
405 409 map.put("settleStatusName", settleStatusName);
406   -
  410 + map.put("isPrint", null==model.getIsPrint()?"":model.getIsPrint()==1?"已打印":"未打印");
407 411 return map;
408 412 }
409 413  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ b218af3
... ... @@ -12,7 +12,7 @@
12 12 BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure);
13 13  
14 14 BaseResponse list(String key, String vcCardNo, Integer weekStart,
15   - Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId,String type);
  15 + Integer weekEnd, Integer age, Integer page, Integer limit, Integer isPrint,Integer userId,String type);
16 16  
17 17 BaseResponse info(String id, Date startDate);
18 18  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ b218af3
... ... @@ -213,7 +213,7 @@
213 213  
214 214 @Override
215 215 public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer
216   - weekEnd, Integer age, Integer page, Integer limit, Integer userId,String isAll) {
  216 + weekEnd, Integer age, Integer page, Integer limit,Integer isPrint, Integer userId,String isAll) {
217 217 boolean flag = false;
218 218 List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
219 219 List<String> hids = new ArrayList<>();
... ... @@ -262,6 +262,9 @@
262 262 criteria.and("pid").in(ids);
263 263 }
264 264  
  265 + if(null!=isPrint){
  266 + criteria.and("isPrint").is(isPrint);
  267 + }
265 268 PageResult pageResult = findMongoPage(BloodPressure.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
266 269 List<BloodPressure> bloodPressures = (List<BloodPressure>) pageResult.getGrid();
267 270 List<Map<String, Object>> restList = new ArrayList<>();
... ... @@ -297,7 +300,7 @@
297 300 temp.put("weight", bloodPressure.getWeight() == null ? "" : bloodPressure.getWeight());
298 301 temp.put("height", bloodPressure.getHeight() == null ? "" : bloodPressure.getHeight());
299 302 temp.put("tireNumber", bloodPressure.getTireNumber() == null ? "" : bloodPressure.getTireNumber());
300   -
  303 + temp.put("isPrint", null==bloodPressure.getIsPrint()?"":bloodPressure.getIsPrint()==1?"已打印":"未打印");
301 304 }
302 305 restList.add(temp);
303 306 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ b218af3
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.utils.*;
9 9 import com.lyms.platform.operate.web.controller.AntenatalExaminationController;
10 10 import com.lyms.platform.operate.web.facade.*;
  11 +import com.lyms.platform.operate.web.service.IBloodPressureService;
11 12 import com.lyms.platform.operate.web.service.PatientWeightService;
12 13 import com.lyms.platform.operate.web.utils.CollectionUtils;
13 14 import com.lyms.platform.operate.web.utils.MathUtil;
... ... @@ -116,6 +117,11 @@
116 117 @Autowired
117 118 private BloodSugarService bloodSugarService;
118 119  
  120 + @Autowired
  121 + private BloodPressureService bloodPressureService;
  122 + @Autowired
  123 + private BabyNutritionService babyNutritionService;
  124 +
119 125 /**
120 126 * 最低：0~13 : 0~1.9 13~40 1.9~11.9
121 127 * 最高： 0~2.2 2.2~15.9
... ... @@ -4216,6 +4222,15 @@
4216 4222 bloodSugarService.update(bloodSugar);
4217 4223 break;
4218 4224 case 3:
  4225 + BloodPressure bloodPressure=new BloodPressure();
  4226 + bloodPressure.setId(id);
  4227 + bloodPressure.setIsPrint(1);
  4228 + bloodPressureService.update(bloodPressure);
  4229 + break;
  4230 + case 4:
  4231 + BabyNutritionModel babyNutritionModel=new BabyNutritionModel();
  4232 + babyNutritionModel.setIsPrint(1);
  4233 + babyNutritionService.updateBabyNutrition(babyNutritionModel,id);
4219 4234 break;
4220 4235 }
4221 4236