jiangjiazhi / regional-platform

Commit 015ba486c2ac93c4c8fa4235879728596a854498

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

7月14隆化妇幼儿保增加屈光字段。同时眼保健检查读取最新一次儿保的屈光值

Showing 8 changed files with 351 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

...	...	@@ -661,6 +661,79 @@
661	661	* 25羟基D3 ng/ml
662	662	*/
663	663	private String lhqjd3;
	664	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	665	+ /**
	666	+ * 屈光筛查，L
	667	+ */
	668	+ private String lhdsl;
	669	+ /**
	670	+ * 屈光筛查，L
	671	+ */
	672	+ private String lhdcl;
	673	+ /**
	674	+ * 屈光筛查，L
	675	+ */
	676	+ private String lhaxisl;
	677	+ /**
	678	+ * 屈光筛查，R
	679	+ */
	680	+ private String lhdsr;
	681	+ /**
	682	+ * 屈光筛查，R
	683	+ */
	684	+ private String lhdcr;
	685	+ /**
	686	+ * 屈光筛查，R
	687	+ */
	688	+ private String lhaxisr;
	689	+
	690	+ public String getLhdsl() {
	691	+ return lhdsl;
	692	+ }
	693	+
	694	+ public void setLhdsl(String lhdsl) {
	695	+ this.lhdsl = lhdsl;
	696	+ }
	697	+
	698	+ public String getLhdcl() {
	699	+ return lhdcl;
	700	+ }
	701	+
	702	+ public void setLhdcl(String lhdcl) {
	703	+ this.lhdcl = lhdcl;
	704	+ }
	705	+
	706	+ public String getLhaxisl() {
	707	+ return lhaxisl;
	708	+ }
	709	+
	710	+ public void setLhaxisl(String lhaxisl) {
	711	+ this.lhaxisl = lhaxisl;
	712	+ }
	713	+
	714	+ public String getLhdsr() {
	715	+ return lhdsr;
	716	+ }
	717	+
	718	+ public void setLhdsr(String lhdsr) {
	719	+ this.lhdsr = lhdsr;
	720	+ }
	721	+
	722	+ public String getLhdcr() {
	723	+ return lhdcr;
	724	+ }
	725	+
	726	+ public void setLhdcr(String lhdcr) {
	727	+ this.lhdcr = lhdcr;
	728	+ }
	729	+
	730	+ public String getLhaxisr() {
	731	+ return lhaxisr;
	732	+ }
	733	+
	734	+ public void setLhaxisr(String lhaxisr) {
	735	+ this.lhaxisr = lhaxisr;
	736	+ }
664	737
665	738	public String getLhqjd() {
666	739	return lhqjd;

...	...	@@ -106,6 +106,18 @@
106	106	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
107	107	return lhBabyEyeCheckFacade.queryBabyEyeListPage(babyModelQuery,loginState.getId());
108	108	}
	109	+ /**
	110	+ * 隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	111	+ * @param id
	112	+ * @param request
	113	+ * @return
	114	+ */
	115	+ @ResponseBody
	116	+ @TokenRequired
	117	+ @RequestMapping(value = "/getBabyCheckDioptric",method = RequestMethod.GET)
	118	+ public BaseResponse getBabyCheckDioptric(String id, HttpServletRequest request) {
	119	+ return lhBabyEyeCheckFacade.getBabyCheckDioptric(id);
	120	+ }
109	121
110	122
111	123

...	...	@@ -776,6 +776,13 @@
776	776	model.setLhqjd(request.getLhqjd());
777	777	model.setLhqjd2(request.getLhqjd2());
778	778	model.setLhqjd3(request.getLhqjd3());
	779	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	780	+ model.setLhdsr(request.getLhdsr());
	781	+ model.setLhdcr(request.getLhdcr());
	782	+ model.setLhaxisr(request.getLhaxisr());
	783	+ model.setLhdsl(request.getLhdsl());
	784	+ model.setLhdcl(request.getLhdcl());
	785	+ model.setLhaxisl(request.getLhaxisl());
779	786	return model;
780	787	}
781	788
...	...	@@ -2792,6 +2799,13 @@
2792	2799	model.setLhqjd(checkModel.getLhqjd());
2793	2800	model.setLhqjd2(checkModel.getLhqjd2());
2794	2801	model.setLhqjd3(checkModel.getLhqjd3());
	2802	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	2803	+ model.setLhdsr(checkModel.getLhdsr());
	2804	+ model.setLhdcr(checkModel.getLhdcr());
	2805	+ model.setLhaxisr(checkModel.getLhaxisr());
	2806	+ model.setLhdsl(checkModel.getLhdsl());
	2807	+ model.setLhdcl(checkModel.getLhdcl());
	2808	+ model.setLhaxisl(checkModel.getLhaxisl());
2795	2809	return model;
2796	2810
2797	2811	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.platform.biz.service.BabyBookbuildingService;
	4	+import com.lyms.platform.biz.service.BabyCheckService;
4	5	import com.lyms.platform.biz.service.LhBabyEyeCheckService;
5	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
6	7	import com.lyms.platform.common.enums.*;
7	8
...	...	@@ -13,8 +14,10 @@
13	14	import com.lyms.platform.permission.dao.master.CouponMapper;
14	15	import com.lyms.platform.permission.model.Organization;
15	16	import com.lyms.platform.permission.service.OrganizationService;
	17	+import com.lyms.platform.pojo.BabyCheckModel;
16	18	import com.lyms.platform.pojo.BabyModel;
17	19	import com.lyms.platform.pojo.LhBabyEyeCheck;
	20	+import com.lyms.platform.query.BabyCheckModelQuery;
18	21	import com.lyms.platform.query.BabyModelQuery;
19	22	import com.lyms.platform.query.LhBabyEyelCheckQuery;
20	23	import com.sun.tools.javac.util.Convert;
...	...	@@ -45,6 +48,8 @@
45	48	private CouponMapper couponMapper;
46	49	@Autowired
47	50	private OperateLogFacade operateLogFacade;
	51	+ @Autowired
	52	+ private BabyCheckService babyCheckService;
48	53
49	54	public BaseResponse addOrUpDate(LhBabyEyeCheck babyCheck, Integer userid) {
50	55	//隆化眼外观新加内容
...	...	@@ -591,5 +596,26 @@
591	596	return map;
592	597	}
593	598
	599	+ public BaseResponse getBabyCheckDioptric(String id) {
	600	+ BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
	601	+ babyCheckModelQuery.setYn(YnEnums.YES.getId());
	602	+ babyCheckModelQuery.setBuildId(id);
	603	+ Map map=new HashMap();
	604	+ List<BabyCheckModel> babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery, "created", Sort.Direction.DESC);
	605	+ if (babyCheckModels.size()>0) {
	606	+ BabyCheckModel checkModel=babyCheckModels.get(0);
	607	+ map.put("lhdsl",checkModel.getLhdsl());
	608	+ map.put("lhdcl",checkModel.getLhdcl());
	609	+ map.put("lhaxisl",checkModel.getLhaxisl());
	610	+ map.put("lhdsr",checkModel.getLhdsr());
	611	+ map.put("lhdcr",checkModel.getLhdcr());
	612	+ map.put("lhaxisr",checkModel.getLhaxisr());
	613	+ }
	614	+ BaseResponse baseResponse=new BaseResponse();
	615	+ baseResponse.setErrormsg("成功");
	616	+ baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	617	+ baseResponse.setObject(map);
	618	+ return baseResponse;
	619	+ }
594	620	}

...	...	@@ -6461,6 +6461,13 @@
6461	6461	model.setLhqjd(checkModel.getLhqjd());
6462	6462	model.setLhqjd2(checkModel.getLhqjd2());
6463	6463	model.setLhqjd3(checkModel.getLhqjd3());
	6464	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	6465	+ model.setLhdsr(checkModel.getLhdsr());
	6466	+ model.setLhdcr(checkModel.getLhdcr());
	6467	+ model.setLhaxisr(checkModel.getLhaxisr());
	6468	+ model.setLhdsl(checkModel.getLhdsl());
	6469	+ model.setLhdcl(checkModel.getLhdcl());
	6470	+ model.setLhaxisl(checkModel.getLhaxisl());
6464	6471	return model;
6465	6472
6466	6473	}

...	...	@@ -620,6 +620,79 @@
620	620	* 25羟基D3 ng/ml
621	621	*/
622	622	private String lhqjd3;
	623	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	624	+ /**
	625	+ * 屈光筛查，L
	626	+ */
	627	+ private String lhdsl;
	628	+ /**
	629	+ * 屈光筛查，L
	630	+ */
	631	+ private String lhdcl;
	632	+ /**
	633	+ * 屈光筛查，L
	634	+ */
	635	+ private String lhaxisl;
	636	+ /**
	637	+ * 屈光筛查，R
	638	+ */
	639	+ private String lhdsr;
	640	+ /**
	641	+ * 屈光筛查，R
	642	+ */
	643	+ private String lhdcr;
	644	+ /**
	645	+ * 屈光筛查，R
	646	+ */
	647	+ private String lhaxisr;
	648	+
	649	+ public String getLhdsl() {
	650	+ return lhdsl;
	651	+ }
	652	+
	653	+ public void setLhdsl(String lhdsl) {
	654	+ this.lhdsl = lhdsl;
	655	+ }
	656	+
	657	+ public String getLhdcl() {
	658	+ return lhdcl;
	659	+ }
	660	+
	661	+ public void setLhdcl(String lhdcl) {
	662	+ this.lhdcl = lhdcl;
	663	+ }
	664	+
	665	+ public String getLhaxisl() {
	666	+ return lhaxisl;
	667	+ }
	668	+
	669	+ public void setLhaxisl(String lhaxisl) {
	670	+ this.lhaxisl = lhaxisl;
	671	+ }
	672	+
	673	+ public String getLhdsr() {
	674	+ return lhdsr;
	675	+ }
	676	+
	677	+ public void setLhdsr(String lhdsr) {
	678	+ this.lhdsr = lhdsr;
	679	+ }
	680	+
	681	+ public String getLhdcr() {
	682	+ return lhdcr;
	683	+ }
	684	+
	685	+ public void setLhdcr(String lhdcr) {
	686	+ this.lhdcr = lhdcr;
	687	+ }
	688	+
	689	+ public String getLhaxisr() {
	690	+ return lhaxisr;
	691	+ }
	692	+
	693	+ public void setLhaxisr(String lhaxisr) {
	694	+ this.lhaxisr = lhaxisr;
	695	+ }
623	696
624	697	public String getLhqjd() {
625	698	return lhqjd;

...	...	@@ -838,6 +838,79 @@
838	838	* 25羟基D3 ng/ml
839	839	*/
840	840	private String lhqjd3;
	841	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	842	+ /**
	843	+ * 屈光筛查，L
	844	+ */
	845	+ private String lhdsl;
	846	+ /**
	847	+ * 屈光筛查，L
	848	+ */
	849	+ private String lhdcl;
	850	+ /**
	851	+ * 屈光筛查，L
	852	+ */
	853	+ private String lhaxisl;
	854	+ /**
	855	+ * 屈光筛查，R
	856	+ */
	857	+ private String lhdsr;
	858	+ /**
	859	+ * 屈光筛查，R
	860	+ */
	861	+ private String lhdcr;
	862	+ /**
	863	+ * 屈光筛查，R
	864	+ */
	865	+ private String lhaxisr;
	866	+
	867	+ public String getLhdsl() {
	868	+ return lhdsl;
	869	+ }
	870	+
	871	+ public void setLhdsl(String lhdsl) {
	872	+ this.lhdsl = lhdsl;
	873	+ }
	874	+
	875	+ public String getLhdcl() {
	876	+ return lhdcl;
	877	+ }
	878	+
	879	+ public void setLhdcl(String lhdcl) {
	880	+ this.lhdcl = lhdcl;
	881	+ }
	882	+
	883	+ public String getLhaxisl() {
	884	+ return lhaxisl;
	885	+ }
	886	+
	887	+ public void setLhaxisl(String lhaxisl) {
	888	+ this.lhaxisl = lhaxisl;
	889	+ }
	890	+
	891	+ public String getLhdsr() {
	892	+ return lhdsr;
	893	+ }
	894	+
	895	+ public void setLhdsr(String lhdsr) {
	896	+ this.lhdsr = lhdsr;
	897	+ }
	898	+
	899	+ public String getLhdcr() {
	900	+ return lhdcr;
	901	+ }
	902	+
	903	+ public void setLhdcr(String lhdcr) {
	904	+ this.lhdcr = lhdcr;
	905	+ }
	906	+
	907	+ public String getLhaxisr() {
	908	+ return lhaxisr;
	909	+ }
	910	+
	911	+ public void setLhaxisr(String lhaxisr) {
	912	+ this.lhaxisr = lhaxisr;
	913	+ }
841	914
842	915	public String getLhqjd() {
843	916	return lhqjd;

...	...	@@ -862,6 +862,79 @@
862	862	* 25羟基D3 ng/ml
863	863	*/
864	864	private String lhqjd3;
	865	+ //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值
	866	+ /**
	867	+ * 屈光筛查，L
	868	+ */
	869	+ private String lhdsl;
	870	+ /**
	871	+ * 屈光筛查，L
	872	+ */
	873	+ private String lhdcl;
	874	+ /**
	875	+ * 屈光筛查，L
	876	+ */
	877	+ private String lhaxisl;
	878	+ /**
	879	+ * 屈光筛查，R
	880	+ */
	881	+ private String lhdsr;
	882	+ /**
	883	+ * 屈光筛查，R
	884	+ */
	885	+ private String lhdcr;
	886	+ /**
	887	+ * 屈光筛查，R
	888	+ */
	889	+ private String lhaxisr;
	890	+
	891	+ public String getLhdsl() {
	892	+ return lhdsl;
	893	+ }
	894	+
	895	+ public void setLhdsl(String lhdsl) {
	896	+ this.lhdsl = lhdsl;
	897	+ }
	898	+
	899	+ public String getLhdcl() {
	900	+ return lhdcl;
	901	+ }
	902	+
	903	+ public void setLhdcl(String lhdcl) {
	904	+ this.lhdcl = lhdcl;
	905	+ }
	906	+
	907	+ public String getLhaxisl() {
	908	+ return lhaxisl;
	909	+ }
	910	+
	911	+ public void setLhaxisl(String lhaxisl) {
	912	+ this.lhaxisl = lhaxisl;
	913	+ }
	914	+
	915	+ public String getLhdsr() {
	916	+ return lhdsr;
	917	+ }
	918	+
	919	+ public void setLhdsr(String lhdsr) {
	920	+ this.lhdsr = lhdsr;
	921	+ }
	922	+
	923	+ public String getLhdcr() {
	924	+ return lhdcr;
	925	+ }
	926	+
	927	+ public void setLhdcr(String lhdcr) {
	928	+ this.lhdcr = lhdcr;
	929	+ }
	930	+
	931	+ public String getLhaxisr() {
	932	+ return lhaxisr;
	933	+ }
	934	+
	935	+ public void setLhaxisr(String lhaxisr) {
	936	+ this.lhaxisr = lhaxisr;
	937	+ }
865	938
866	939	public String getLhqjd() {
867	940	return lhqjd;