jiangjiazhi / regional-platform

Commit 7848782a05fa7895cbe3bff4e50e8c567827b393

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

孕产-临时体重是否打印筛选及修改状态

Showing 6 changed files with 31 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java

...	...	@@ -34,7 +34,18 @@
34	34	private String temporaryUserId;
35	35
36	36	private Date printingTime;
	37	+ /**
	38	+ * 是否打印过报告 1：已打印 2：未已打印
	39	+ */
	40	+ private Integer isPrint ;
37	41
	42	+ public Integer getIsPrint() {
	43	+ return isPrint;
	44	+ }
	45	+
	46	+ public void setIsPrint(Integer isPrint) {
	47	+ this.isPrint = isPrint;
	48	+ }
38	49	public Date getPrintingTime() {
39	50	return printingTime;
40	51	}

...	...	@@ -338,7 +338,7 @@
338	338	/**
339	339	* 修改打印状态
340	340	* @param id id
341		- * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理
	341	+ * @param type 1：体重管理2：血糖管理3:血压管理4:儿童膳食营养管理5:临时体重管理
342	342	* @return
343	343	*/
344	344	@ResponseBody

...	...	@@ -55,8 +55,8 @@
55	55	@RequestMapping(value = "/queryAll", method = RequestMethod.GET)
56	56	@TokenRequired
57	57	@ResponseBody
58		- public BaseResponse queryAll(String key, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
59		- return temporaryWeightService.queryAll(key, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
	58	+ public BaseResponse queryAll(String key, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit,Integer isPrint ,HttpServletRequest request) {
	59	+ return temporaryWeightService.queryAll(key, currentWeekStart, currentWeekEnd, age, page, limit, isPrint , getUserId(request));
60	60	}
61	61
62	62	@ResponseBody

...	...	@@ -14,7 +14,7 @@
14	14
15	15	/*BaseResponse queryOne(String id);
16	16	*/
17		- BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId);
	17	+ BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit,Integer isPrint , Integer userId);
18	18
19	19	BaseResponse info(String id);
20	20

1	1	package com.lyms.platform.operate.web.service.impl;
2	2
3	3	import com.lyms.platform.beans.MsgRequest;
	4	+import com.lyms.platform.biz.dal.ITemporaryWeightDao;
4	5	import com.lyms.platform.biz.service.*;
5	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
6	7	import com.lyms.platform.common.enums.*;
...	...	@@ -121,6 +122,8 @@
121	122	private BloodPressureService bloodPressureService;
122	123	@Autowired
123	124	private BabyNutritionService babyNutritionService;
	125	+ @Autowired
	126	+ private ITemporaryWeightDao temporaryWeightDao;
124	127
125	128	/**
126	129	* 最低：0~13 : 0~1.9 13~40 1.9~11.9
...	...	@@ -4234,6 +4237,11 @@
4234	4237	BabyNutritionModel babyNutritionModel=new BabyNutritionModel();
4235	4238	babyNutritionModel.setIsPrint(1);
4236	4239	babyNutritionService.updateBabyNutrition(babyNutritionModel,id);
	4240	+ break;
	4241	+ case 5:
	4242	+ TemporaryWeightModel temporaryWeightModel=new TemporaryWeightModel();
	4243	+ temporaryWeightModel.setIsPrint(1);
	4244	+ temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("id").is(id)),temporaryWeightModel);
4237	4245	break;
4238	4246	}
4239	4247

...	...	@@ -123,6 +123,9 @@
123	123	pw.setBmi(patientWeightService.getBmi(temporaryUser.getBeforeWeight(), temporaryUser.getBeforeHeight()));
124	124	}
125	125
	126	+ if(null!=weightModel.getIsPrint()){
	127	+ pw.setIsPrint(weightModel.getIsPrint());
	128	+ }
126	129	temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(pw.getId())), pw);
127	130	return RespBuilder.buildSuccess(pw.getId());
128	131	}
...	...	@@ -274,7 +277,7 @@
274	277	}
275	278	*/
276	279	@Override
277		- public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId) {
	280	+ public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit,Integer isPrint , Integer userId) {
278	281	boolean flag = false;
279	282	List<String> hospital = groupsFacade.findGroupHospital(userId, false);
280	283	Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
...	...	@@ -305,6 +308,9 @@
305	308	}
306	309	criteria.and("temporaryUserId").in(ids);
307	310	}
	311	+ if(null!= isPrint){
	312	+ criteria.and("isPrint").is(isPrint);
	313	+ }
308	314	PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
309	315	List<TemporaryWeightModel> patientWeights = (List<TemporaryWeightModel>) pageResult.getGrid();
310	316	List<Map<String, Object>> restMap = new ArrayList<>();
...	...	@@ -337,6 +343,7 @@
337	343	temp.put("doctorName", patientWeight.getDoctorName());
338	344	temp.put("bregmatic", temporaryUser.getBregmatic());
339	345	temp.put("cardNo", temporaryUser.getCardID());
	346	+ temp.put("isPrint", null==patientWeight.getIsPrint()?"":patientWeight.getIsPrint()==1?"已打印":"未打印");
340	347	restMap.add(temp);
341	348	}
342	349	}