jiangjiazhi / regional-platform

Commit c88cd0addc7e11a690ed3c7a51c07807fbd1c535

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NutritionInfoRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.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/ReportServiceImpl.java

...	...	@@ -351,6 +351,17 @@
351	351	//承德病人id
352	352	private String blNum;
353	353
	354	+ //面部信息
	355	+ private String face;
	356	+
	357	+ public String getFace() {
	358	+ return face;
	359	+ }
	360	+
	361	+ public void setFace(String face) {
	362	+ this.face = face;
	363	+ }
	364	+
354	365	public String getBlNum() {
355	366	return blNum;
356	367	}

...	...	@@ -6,9 +6,11 @@
6	6	import com.lyms.platform.common.result.BaseObjectResponse;
7	7	import com.lyms.platform.common.result.BaseResponse;
8	8	import com.lyms.platform.operate.web.facade.MeasureInfoFacade;
	9	+import com.lyms.platform.operate.web.facade.TempFacade;
9	10	import com.lyms.platform.operate.web.request.MeasureInfoRequest;
10	11	import com.lyms.platform.operate.web.request.NutritionInfoRequest;
11	12	import com.lyms.platform.operate.web.request.SmsTemplateRequest;
	13	+import com.lyms.platform.operate.web.request.TempAddRequest;
12	14	import org.springframework.beans.factory.annotation.Autowired;
13	15	import org.springframework.stereotype.Controller;
14	16	import org.springframework.web.bind.annotation.*;
...	...	@@ -27,6 +29,10 @@
27	29
28	30	@Autowired
29	31	private MeasureInfoFacade measureInfoFacade;
	32	+
	33	+ @Autowired
	34	+ private TempFacade tempFacade;
	35	+
30	36	/**
31	37	* 血糖和脉搏身高和体重的值列表
32	38	* valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温 4血糖
33	39
34	40
35	41
...	...	@@ -140,14 +146,84 @@
140	146	* @param request
141	147	* @return
142	148	*/
143		- @RequestMapping(method = RequestMethod.POST, value = "/addtNutritionInfo")
	149	+ @RequestMapping(method = RequestMethod.POST, value = "/addNutritionInfo")
144	150	@ResponseBody
145		- public BaseObjectResponse addtNutritionInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest,
	151	+ public BaseObjectResponse addNutritionInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest,
146	152	HttpServletRequest request
147	153	)
148	154	{
149		- return measureInfoFacade.addtNutritionInfo(nutritionInfoRequest);
	155	+ return measureInfoFacade.addNutritionInfo(nutritionInfoRequest);
150	156	}
	157	+
	158	+
	159	+ /**
	160	+ * 获取面部信息
	161	+ * @param patientId
	162	+ * @param request
	163	+ * @return
	164	+ */
	165	+ @RequestMapping(method = RequestMethod.GET, value = "/getFaceInfo")
	166	+ @ResponseBody
	167	+ public BaseObjectResponse getFaceInfo(@RequestParam(value = "patientId", required = true) String patientId,
	168	+ HttpServletRequest request
	169	+ )
	170	+ {
	171	+ return measureInfoFacade.getFaceInfo(patientId);
	172	+ }
	173	+
	174	+
	175	+ /**
	176	+ * 添加面部信息
	177	+ * @param nutritionInfoRequest
	178	+ * @param request
	179	+ * @return
	180	+ */
	181	+ @RequestMapping(method = RequestMethod.POST, value = "/addFaceInfo")
	182	+ @ResponseBody
	183	+ public BaseResponse addFaceInfo(@RequestBody NutritionInfoRequest nutritionInfoRequest,
	184	+ HttpServletRequest request
	185	+ )
	186	+ {
	187	+ return measureInfoFacade.addFaceInfo(nutritionInfoRequest);
	188	+ }
	189	+
	190	+
	191	+ /**
	192	+ * 添加体温
	193	+ * @param nutritionInfoRequest
	194	+ * @param request
	195	+ * @return
	196	+ */
	197	+ @RequestMapping(method = RequestMethod.POST, value = "/addNutritionTemp")
	198	+ @ResponseBody
	199	+ public BaseResponse addNutritionTemp(@RequestBody NutritionInfoRequest nutritionInfoRequest,
	200	+ HttpServletRequest request
	201	+ )
	202	+ {
	203	+ TempAddRequest addRequest = new TempAddRequest();
	204	+ addRequest.setParentId(nutritionInfoRequest.getPatientId());
	205	+ addRequest.setPid(nutritionInfoRequest.getPid());
	206	+ return tempFacade.addOrUpdateOneTemp(addRequest, nutritionInfoRequest.getHospitalId(), "");
	207	+ }
	208	+
	209	+
	210	+ /**
	211	+ * 添加血压
	212	+ * @param nutritionInfoRequest
	213	+ * @param request
	214	+ * @return
	215	+ */
	216	+ @RequestMapping(method = RequestMethod.POST, value = "/addBloodPressure")
	217	+ @ResponseBody
	218	+ public BaseResponse addBloodPressure(@RequestBody NutritionInfoRequest nutritionInfoRequest,
	219	+ HttpServletRequest request
	220	+ )
	221	+ {
	222	+
	223	+ return measureInfoFacade.addBloodPressure(nutritionInfoRequest);
	224	+ }
	225	+
	226	+
151	227
152	228
153	229

...	...	@@ -8,13 +8,17 @@
8	8	import com.lyms.platform.common.result.BaseListResponse;
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
	11	+import com.lyms.platform.common.result.RespBuilder;
11	12	import com.lyms.platform.common.utils.DateUtil;
12	13	import com.lyms.platform.common.utils.ExceptionUtils;
13	14	import com.lyms.platform.operate.web.request.MeasureInfoRequest;
14	15	import com.lyms.platform.operate.web.request.NutritionInfoRequest;
15	16	import com.lyms.platform.operate.web.result.MeasureBaseInfoResult;
16	17	import com.lyms.platform.operate.web.result.MeasureInfoResult;
	18	+import com.lyms.platform.operate.web.service.PatientWeightService;
17	19	import com.lyms.platform.operate.web.utils.CommonsHelper;
	20	+import com.lyms.platform.operate.web.utils.MongoUtil;
	21	+import com.lyms.platform.permission.dao.master.CouponMapper;
18	22	import com.lyms.platform.permission.model.Organization;
19	23	import com.lyms.platform.permission.service.MeasureDataInfoService;
20	24	import com.lyms.platform.permission.service.MeasureUserInfoService;
21	25
22	26
...	...	@@ -22,15 +26,18 @@
22	26	import com.lyms.platform.pojo.*;
23	27	import com.lyms.platform.query.*;
24	28	import org.apache.commons.collections.CollectionUtils;
	29	+import org.apache.commons.collections.MapUtils;
25	30	import org.apache.commons.dbutils.DbUtils;
26	31	import org.apache.commons.dbutils.QueryRunner;
27	32	import org.apache.commons.dbutils.handlers.BeanListHandler;
28	33	import org.apache.commons.lang.StringUtils;
29	34	import org.springframework.beans.factory.annotation.Autowired;
	35	+import org.springframework.data.mongodb.core.MongoTemplate;
30	36	import org.springframework.data.mongodb.core.query.Criteria;
31	37	import org.springframework.data.mongodb.core.query.Query;
32	38	import org.springframework.stereotype.Component;
33	39
	40	+import java.math.BigDecimal;
34	41	import java.sql.Connection;
35	42	import java.util.*;
36	43
37	44
...	...	@@ -58,8 +65,23 @@
58	65	@Autowired
59	66	private AntenatalExaminationService antenatalExaminationService;
60	67
	68	+ @Autowired
	69	+ private PatientWeightService patientWeightService;
61	70
62	71	@Autowired
	72	+ private CouponMapper couponMapper;
	73	+
	74	+
	75	+ @Autowired
	76	+ private BloodPressureService bloodPressureService;
	77	+
	78	+ @Autowired
	79	+ private MongoTemplate mongoTemplate;
	80	+
	81	+ @Autowired
	82	+ private MongoUtil mongoUtil;
	83	+
	84	+ @Autowired
63	85	private BasicConfigService basicConfigService;
64	86
65	87	private static String[] blood_item = new String[]{"--","--","--","--","--","--","--","--","--"};
66	88
...	...	@@ -692,12 +714,15 @@
692	714	patInfo.put("dueDate",DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280)));
693	715	patInfo.put("phone",pat.getPhone());
694	716	patInfo.put("vcCardNo",pat.getVcCardNo());
	717	+ patInfo.put("certType",String.valueOf(certType));
	718	+ patInfo.put("certNo",certNo);
695	719
696	720	String beforeWeight = "";
697	721	String beforeHeight = "";
698	722	String tireNumber = "";
699	723	String bmi = "";
700	724	String currentWeight = "";
	725	+ String lastWeight = "";
701	726
702	727	List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(pat.getId())));
703	728	if (CollectionUtils.isNotEmpty(patientWeights))
...	...	@@ -706,6 +731,7 @@
706	731	bmi = weight.getBmi() == null ? "" : weight.getBmi();
707	732	beforeWeight = weight.getBeforeWeight() == null ? "" : weight.getBeforeWeight();
708	733	beforeHeight = weight.getBeforeHeight() == null ? "" : weight.getBeforeHeight();
	734	+ lastWeight = weight.getNowWeight() == null ? "" : weight.getNowWeight();
709	735	}
710	736	else
711	737	{
...	...	@@ -729,6 +755,8 @@
729	755	patInfo.put("bmi",bmi);
730	756	patInfo.put("currentWeight",currentWeight);
731	757	patInfo.put("patientId",pat.getId());
	758	+ patInfo.put("lastWeight",lastWeight);
	759	+ patInfo.put("pid",pat.getPid());
732	760
733	761	objectResponse.setData(patInfo);
734	762	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -736,8 +764,158 @@
736	764	return objectResponse;
737	765	}
738	766
739		- public BaseObjectResponse addtNutritionInfo(NutritionInfoRequest nutritionInfoRequest) {
740		- return null;
	767	+ public BaseObjectResponse addNutritionInfo(NutritionInfoRequest nutritionInfoRequest) {
	768	+
	769	+ Patients patients = patientsService.findOnePatientById(nutritionInfoRequest.getPatientId());
	770	+ List<PatientWeight> patientWeights = patientWeightService2.queryPatientWeight(Query.query(Criteria.where("patientId").is(nutritionInfoRequest.getPatientId())));
	771	+ String hospitalId = nutritionInfoRequest.getHospitalId();
	772	+
	773	+ Map<String, String> dayWeights = new LinkedHashMap<>();
	774	+ List<Map<String, Object>> dayWeights2 = new ArrayList<>();
	775	+
	776	+ String currentWeight = nutritionInfoRequest.getCurrentWeight();
	777	+ if (CollectionUtils.isNotEmpty(patientWeights))
	778	+ {
	779	+ PatientWeight pw = patientWeights.get(0);
	780	+
	781	+ if(pw != null) {
	782	+ if(MapUtils.isNotEmpty(pw.getDayWeights())) {
	783	+ dayWeights = pw.getDayWeights();
	784	+ }
	785	+ dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);
	786	+ pw.setDayWeights(dayWeights);
	787	+ pw.setNowWeight(currentWeight);
	788	+
	789	+ String ymdDate = DateUtil.getyyyy_MM_dd(new Date());
	790	+ boolean flag = true;
	791	+ if(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(pw.getDayWeights2())) {
	792	+ dayWeights2 = pw.getDayWeights2();
	793	+ }
	794	+ for (Map<String, Object> map : dayWeights2) {
	795	+ if(map.get("date").equals(ymdDate)) {
	796	+ flag = false;
	797	+ map.put("hospitalId", hospitalId);
	798	+ map.put("hospitalName", couponMapper.getHospitalName(hospitalId));
	799	+ map.put("date", ymdDate);
	800	+ map.put("nowWeight", currentWeight);
	801	+ }
	802	+ }
	803	+ if(flag) {
	804	+ Map<String, Object> m = new HashMap<>();
	805	+ m.put("hospitalId", hospitalId);
	806	+ m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
	807	+ m.put("date", ymdDate);
	808	+ m.put("nowWeight", currentWeight);
	809	+ dayWeights2.add(m);
	810	+ }
	811	+ pw.setDayWeights2(dayWeights2);
	812	+ pw.setModified(new Date());
	813	+ patientWeightService2.update(Query.query(Criteria.where("id").is(pw.getId())), pw);
	814	+ }
	815	+ }
	816	+ else
	817	+ {
	818	+ PatientWeight patientWeight = new PatientWeight();
	819	+ patientWeight.setNowWeight(currentWeight);
	820	+ patientWeight.setPatientId(patients.getId());
	821	+ patientWeight.setBeforeWeight(nutritionInfoRequest.getBeforeWeight());
	822	+ patientWeight.setBeforeHeight(nutritionInfoRequest.getBeforeHeight());
	823	+
	824	+ dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);
	825	+ patientWeight.setPid(patients.getPid());
	826	+ patientWeight.setDayWeights(dayWeights);
	827	+ patientWeight.setHospitalId(hospitalId);
	828	+// patientWeight.setOperaterId(userId.toString());
	829	+ patientWeight.setCreated(new Date());
	830	+ if(StringUtils.isNotBlank(currentWeight) && nutritionInfoRequest.getBeforeHeight() != null) {
	831	+ patientWeight.setBmi(patientWeightService.getBmi(currentWeight, nutritionInfoRequest.getBeforeHeight()));
	832	+ }
	833	+ patientWeight.setYn("1");
	834	+
	835	+ Map<String, Object> m = new HashMap<>();
	836	+ m.put("hospitalId", hospitalId);
	837	+ m.put("hospitalName", couponMapper.getHospitalName(hospitalId));
	838	+ m.put("date", DateUtil.getyyyy_MM_dd(new Date()));
	839	+ m.put("nowWeight", currentWeight);
	840	+ dayWeights2.add(m);
	841	+ patientWeight.setDayWeights2(dayWeights2);
	842	+
	843	+ patientWeight.setModified(new Date());
	844	+ patientWeightService2.add(patientWeight);
	845	+
	846	+ }
	847	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	848	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	849	+ objectResponse.setErrormsg("成功");
	850	+ return objectResponse;
	851	+ }
	852	+
	853	+ public BaseObjectResponse getFaceInfo(String patientId) {
	854	+ Patients patients = patientsService.findOnePatientById(patientId);
	855	+ Map<String,String> faceData = new HashMap<>();
	856	+ faceData.put("face",patients.getFace() == null ? "" : patients.getFace());
	857	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	858	+ objectResponse.setData(faceData);
	859	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	860	+ objectResponse.setErrormsg("成功");
	861	+ return objectResponse;
	862	+ }
	863	+
	864	+ public BaseResponse addFaceInfo(NutritionInfoRequest nutritionInfoRequest) {
	865	+ Patients patients = patientsService.findOnePatientById(nutritionInfoRequest.getPatientId());
	866	+ patients.setFace(nutritionInfoRequest.getFace());
	867	+ patientsService.updatePatient(patients);
	868	+
	869	+ BaseResponse objectResponse = new BaseResponse();
	870	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	871	+ objectResponse.setErrormsg("成功");
	872	+ return objectResponse;
	873	+ }
	874	+
	875	+
	876	+
	877	+ public BaseResponse addBloodPressure(NutritionInfoRequest nutritionInfoRequest) {
	878	+
	879	+ BloodPressure bloodPressure = new BloodPressure();
	880	+ bloodPressure.setParentId(nutritionInfoRequest.getPatientId());
	881	+ bloodPressure.setSsy(nutritionInfoRequest.getSsy());
	882	+ bloodPressure.setSzy(nutritionInfoRequest.getSzy());
	883	+ bloodPressure.setPulse(nutritionInfoRequest.getPulse());
	884	+
	885	+ String hospitalId = nutritionInfoRequest.getHospitalId();
	886	+ Map<String, Object> temp = new LinkedHashMap<>();
	887	+ bloodPressure.setModified(new Date());
	888	+ temp.put("szy", bloodPressure.getSzy());
	889	+ temp.put("ssy", bloodPressure.getSsy());
	890	+ temp.put("pulse", bloodPressure.getPulse());
	891	+ temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date()));
	892	+ temp.put("hospitalId", hospitalId);
	893	+ Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
	894	+ BloodPressure bp = null;
	895	+ if(p != null) {
	896	+ bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class);
	897	+ }
	898	+ if(bp == null) {
	899	+ String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId);
	900	+ bloodPressure.setPid(mongoUtil.getPid(parentId));
	901	+ bloodPressure.setParentId(parentId);
	902	+ bloodPressure.setYn(YnEnums.YES.getId());
	903	+ bloodPressure.setCreated(new Date());
	904	+ bloodPressure.setHospitalId(hospitalId);
	905	+ bloodPressure.setOperaterId(null);
	906	+ Map<String, Map<String, Object>> infos = new LinkedHashMap<>();
	907	+ infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
	908	+ bloodPressure.setInfos(infos);
	909	+ bloodPressureService.add(bloodPressure);
	910	+ } else {
	911	+ Map<String, Map<String, Object>> infos = bp.getInfos();
	912	+ infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
	913	+ bloodPressure.setInfos(infos);
	914	+ bloodPressure.setId(bp.getId());
	915	+ bloodPressure.setPid(bp.getPid());
	916	+ bloodPressureService.update(bloodPressure);
	917	+ }
	918	+ return RespBuilder.buildSuccess();
741	919	}
742	920	}

...	...	@@ -86,6 +86,10 @@
86	86	public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, Integer userId) {
87	87	Assert.notNull(addRequest, "请求为空.");
88	88	String hospital = autoMatchFacade.getHospitalId(userId);
	89	+ return addOrUpdateOneTemp( addRequest, hospital, String.valueOf(userId));
	90	+ }
	91	+
	92	+ public BaseResponse addOrUpdateOneTemp(TempAddRequest addRequest, String hospital,String userId) {
89	93	String parentId = mongoUtil.doHidePatient(addRequest.getParentId(), hospital);
90	94	addRequest.setParentId(parentId);
91	95	TempQuery tempQuery = new TempQuery();
...	...	@@ -100,7 +104,7 @@
100	104	tempQuery.setHospitalList(list);
101	105	TempModel tempModel = addRequest.convertToDataModel();
102	106
103		- tempModel.setOperator(userId + "");
	107	+ tempModel.setOperator(userId);
104	108	tempModel.sethId(hospital);
105	109
106	110	List<TempModel> temp = tempService.queryTemp(tempQuery);

...	...	@@ -4,5 +4,112 @@
4	4	* Created by Administrator on 2018-05-07.
5	5	*/
6	6	public class NutritionInfoRequest {
	7	+
	8	+ private String patientId;
	9	+
	10	+ // 当前体重currentWeight
	11	+ private String currentWeight;
	12	+
	13	+ private String hospitalId;
	14	+
	15	+ private String beforeWeight;
	16	+ private String beforeHeight;
	17	+ private String tireNumber;
	18	+
	19	+ private String face;
	20	+
	21	+ private String pid;
	22	+
	23	+ private String szy;
	24	+ private String ssy;
	25	+ private Integer pulse;
	26	+
	27	+ public String getSzy() {
	28	+ return szy;
	29	+ }
	30	+
	31	+ public void setSzy(String szy) {
	32	+ this.szy = szy;
	33	+ }
	34	+
	35	+ public String getSsy() {
	36	+ return ssy;
	37	+ }
	38	+
	39	+ public void setSsy(String ssy) {
	40	+ this.ssy = ssy;
	41	+ }
	42	+
	43	+ public Integer getPulse() {
	44	+ return pulse;
	45	+ }
	46	+
	47	+ public void setPulse(Integer pulse) {
	48	+ this.pulse = pulse;
	49	+ }
	50	+
	51	+ public String getPid() {
	52	+ return pid;
	53	+ }
	54	+
	55	+ public void setPid(String pid) {
	56	+ this.pid = pid;
	57	+ }
	58	+
	59	+ public String getBeforeWeight() {
	60	+ return beforeWeight;
	61	+ }
	62	+
	63	+ public void setBeforeWeight(String beforeWeight) {
	64	+ this.beforeWeight = beforeWeight;
	65	+ }
	66	+
	67	+ public String getBeforeHeight() {
	68	+ return beforeHeight;
	69	+ }
	70	+
	71	+ public void setBeforeHeight(String beforeHeight) {
	72	+ this.beforeHeight = beforeHeight;
	73	+ }
	74	+
	75	+ public String getTireNumber() {
	76	+ return tireNumber;
	77	+ }
	78	+
	79	+ public void setTireNumber(String tireNumber) {
	80	+ this.tireNumber = tireNumber;
	81	+ }
	82	+
	83	+ public String getFace() {
	84	+ return face;
	85	+ }
	86	+
	87	+ public void setFace(String face) {
	88	+ this.face = face;
	89	+ }
	90	+
	91	+ public String getHospitalId() {
	92	+ return hospitalId;
	93	+ }
	94	+
	95	+ public void setHospitalId(String hospitalId) {
	96	+ this.hospitalId = hospitalId;
	97	+ }
	98	+
	99	+ public String getPatientId() {
	100	+ return patientId;
	101	+ }
	102	+
	103	+ public void setPatientId(String patientId) {
	104	+ this.patientId = patientId;
	105	+ }
	106	+
	107	+ public String getCurrentWeight() {
	108	+ return currentWeight;
	109	+ }
	110	+
	111	+ public void setCurrentWeight(String currentWeight) {
	112	+ this.currentWeight = currentWeight;
	113	+ }
7	114	}

...	...	@@ -27,6 +27,8 @@
27	27
28	28	BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight);
29	29
	30	+ String getBmi(String weight, String height);
	31	+
30	32	BaseResponse update(Integer userId, String id, String beforeWeight, String beforeHeight, String date, String nowWeight, String bregmatic, String bregmaticOther, boolean sync);
31	33	}

...	...	@@ -275,7 +275,8 @@
275	275	}
276	276
277	277	// 体质指数（BMI）=孕前体重（kg）÷孕前身高^2（m）
278		- public static String getBmi(String weight, String height) {
	278	+ @Override
	279	+ public String getBmi(String weight, String height) {
279	280	if(StringUtils.isNotBlank(weight) && StringUtils.isNotEmpty(height)) {
280	281	Double w = Double.parseDouble(weight);
281	282	Double h = Double.parseDouble(height) / 100l;

...	...	@@ -4,6 +4,7 @@
4	4	import com.alibaba.fastjson.JSONObject;
5	5	import com.lyms.hospitalapi.pojo.ReportModel;
6	6	import com.lyms.platform.biz.service.CommonService;
	7	+import com.lyms.platform.biz.service.PatientWeightService2;
7	8	import com.lyms.platform.common.enums.*;
8	9	import com.lyms.platform.common.result.BaseObjectResponse;
9	10	import com.lyms.platform.common.result.PageResult;
...	...	@@ -16,6 +17,7 @@
16	17	import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
17	18	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
18	19	import com.lyms.platform.operate.web.service.IReportService;
	20	+import com.lyms.platform.operate.web.service.PatientWeightService;
19	21	import com.lyms.platform.operate.web.utils.*;
20	22	import com.lyms.platform.permission.dao.master.CouponMapper;
21	23	import com.lyms.platform.permission.model.Organization;
...	...	@@ -79,6 +81,9 @@
79	81	private UsersService usersService;
80	82
81	83	@Autowired
	84	+ private PatientWeightService patientWeightService;
	85	+
	86	+ @Autowired
82	87	private CommonService commonService;
83	88
84	89	private static final Map<String, String> colorMap = new HashMap<>();
...	...	@@ -1013,7 +1018,7 @@
1013	1018	if(tzFlag) {
1014	1019	for (AntExChuModel antExChuModel : antExChuModels) {
1015	1020	if(hospitalId.equals(antExChuModel.getHospitalId()) && StringUtils.isNotEmpty(antExChuModel.getYqWeight()) && StringUtils.isNotEmpty(antExChuModel.getHeight())) {
1016		- setReport(tzMap, weights, antExChuModel.getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModel.getYqWeight(), antExChuModel.getHeight()));
	1021	+ setReport(tzMap, weights, antExChuModel.getYqWeight(), patientWeightService.getBmi(antExChuModel.getYqWeight(), antExChuModel.getHeight()));
1017	1022	break;
1018	1023	}
1019	1024	}