jiangjiazhi / regional-platform

Commit 0b4384bbf23064b8819dbf7c56f035695f25c418

Authored by landong2015 over 8 years ago

Exists in master and in 7 other branches

新增查看复诊接口

Showing 3 changed files with 52 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitUtils.java

...	...	@@ -19,6 +19,7 @@
19	19	import org.springframework.beans.factory.annotation.Autowired;
20	20	import org.springframework.stereotype.Controller;
21	21	import org.springframework.web.bind.annotation.*;
	22	+import sun.jdbc.odbc.OdbcDef;
22	23
23	24	import javax.servlet.http.HttpServletRequest;
24	25	import javax.servlet.http.HttpServletResponse;
25	26
26	27
...	...	@@ -253,13 +254,18 @@
253	254
254	255	//查询初诊接口
255	256
256		- //查询复诊接口
	257	+ /**
	258	+ * 查询复诊接口
	259	+ * @param id
	260	+ * @param request
	261	+ * @return
	262	+ */
257	263	@RequestMapping(method = RequestMethod.GET, value = "/findAntenatalExamination")
258		-// @TokenRequired
	264	+ @TokenRequired
259	265	public BaseResponse findAntenatalExamination(@RequestParam("id")String id,
260	266	HttpServletRequest request){
261	267
262		- return null;
	268	+ return antExRecordFacade.findAntenatalExamination(id);
263	269	}
264	270
265	271

...	...	@@ -17,6 +17,7 @@
17	17	import com.lyms.platform.operate.web.utils.CommonsHelper;
18	18	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
19	19	import com.lyms.platform.operate.web.utils.UnitConstants;
	20	+import com.lyms.platform.operate.web.utils.UnitUtils;
20	21	import com.lyms.platform.permission.model.Organization;
21	22	import com.lyms.platform.permission.model.OrganizationQuery;
22	23	import com.lyms.platform.permission.model.Users;
23	24
...	...	@@ -26,10 +27,8 @@
26	27	import com.lyms.platform.query.*;
27	28	import org.apache.commons.collections.CollectionUtils;
28	29	import org.apache.commons.collections.MapUtils;
29		-import org.apache.commons.lang.*;
30	30	import org.apache.commons.lang.math.NumberUtils;
31	31	import org.springframework.beans.factory.annotation.Autowired;
32		-import org.springframework.data.domain.Sort;
33	32	import org.springframework.stereotype.Component;
34	33
35	34	import javax.servlet.http.HttpServletResponse;
...	...	@@ -635,7 +634,7 @@
635	634
636	635	/* 复诊信息 */
637	636	map.put("chiefComplaint", data.getChiefComplaint());
638		- map.put("weight", unitSplice(data.getWeight(),UnitConstants.KG));
	637	+ map.put("weight", UnitUtils.unitSplice(data.getWeight(), UnitConstants.KG));
639	638	// 血压
640	639	String ssy = "";
641	640	String szy = "";
...	...	@@ -644,10 +643,19 @@
644	643	ssy = chBpMap.get("ssy");
645	644	szy = chBpMap.get("szy");
646	645	}
647		- map.put("bp", unitSplice(ssy + "/" + szy , UnitConstants.MMHG));
648		- map.put("gongGao", unitSplice(data.getGongGao(),UnitConstants.CM));
649		- map.put("abdominalCircumference", unitSplice(data.getAbdominalCircumference(),UnitConstants.CM));
650		- map.put("edema","");
	646	+ map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
	647	+ map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM));
	648	+ map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
	649	+ String edema = "";
	650	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())){
	651	+ for (FuZhongEnums fuZhongEnums:FuZhongEnums.values()){
	652	+ if (data.getEdema().equals(fuZhongEnums.getId())){
	653	+ edema = fuZhongEnums.getName();
	654	+ }
	655	+ }
	656	+ }
	657	+ map.put("edema",edema);
	658	+
651	659	map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber()));
652	660	//胎儿情况
653	661	List<Map> tireList = new ArrayList<>();
...	...	@@ -660,7 +668,7 @@
660	668	String join = tire.get("join");
661	669
662	670	Map<String,Object> tireMap = new HashMap<>();
663		- tireMap.put("heartRate",unitSplice(heartRate,UnitConstants.CIFEN));
	671	+ tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
664	672	tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
665	673	tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
666	674	tireMap.put("join", JoinEnums.getTitle(join));
667	675
...	...	@@ -670,10 +678,10 @@
670	678	map.put("tireData",tireList);
671	679
672	680	/* 辅助信息 */
673		- map.put("hemoglobin",unitSplice(data.getHemoglobin(),UnitConstants.GL));
	681	+ map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
674	682	map.put("urineProtein",data.getUrineProtein());
675		- map.put("bloodSugar",unitSplice(data.getUrineProtein(),UnitConstants.MMOLL));
676		- map.put("bChao",data.getbChao());//TODO ?????
	683	+ map.put("bloodSugar", UnitUtils.unitSplice(data.getUrineProtein(), UnitConstants.MMOLL));
	684	+ map.put("bChao",data.getbChao());
677	685
678	686	/* 诊断指导 */
679	687	String diagnosis = "";
680	688
681	689
...	...	@@ -694,21 +702,16 @@
694	702	}
695	703	}
696	704	map.put("diagnosis",diagnosis);
	705	+ map.put("treatmentOpinion",data.getTreatmentOpinion());
	706	+ map.put("guide",data.getGuide());
697	707
698		-
699	708	br.setErrorcode(ErrorCodeConstants.SUCCESS);
700	709	br.setErrormsg("成功");
701	710	br.setData(map);
702	711	return br;
703	712	}
704	713
705		- //拼接单位
706		- public String unitSplice(Object data,String unit){
707		- if (data==null){
708		- return null;
709		- }
710		- return data.toString() + unit;
711		- }
	714	+
712	715
713	716
714	717

	1	+package com.lyms.platform.operate.web.utils;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2017/1/11 0011.
	5	+ */
	6	+public class UnitUtils {
	7	+
	8	+ /**
	9	+ * 拼接单位
	10	+ * @param data
	11	+ * @param unit
	12	+ * @return
	13	+ */
	14	+ public static String unitSplice(Object data,String unit){
	15	+ if (data==null){
	16	+ return null;
	17	+ }
	18	+ return data.toString() + unit;
	19	+ }
	20	+
	21	+}