liquanyu / regional-platform

Commit 96533fef0783d4b6c073653f458410df9b01d5c4

Authored by yangfei about 8 years ago

两癌筛查开发

Showing 6 changed files with 147 additions and 92 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java

...	...	@@ -42,7 +42,7 @@
42	42	private String areaId;
43	43	//街道
44	44	private String streetId;
45		- //详细
	45	+ //详细地址
46	46	private String address;
47	47	//个案编号
48	48	private String number;
...	...	@@ -144,7 +144,7 @@
144	144	//检査人员
145	145	private String rxlJcry;
146	146	//检査日期
147		- private String rxlJcrq;
	147	+ private Date rxlJcrq;
148	148	//(四〉乳腺X线检査（未作X线检査不填写此项）
149	149	//乳腺X线评估左
150	150	private String rxPgz;
...	...	@@ -162,7 +162,7 @@
162	162	//病理诊断者
163	163	private String sfBlzd;
164	164	//病理检査日期
165		- private String sfJcrq;
	165	+ private Date sfJcrq;
166	166	//最后诊断
167	167	private String sfZhzd;
168	168	//TNM分期
...	...	@@ -170,7 +170,7 @@
170	170	//诊治机构
171	171	private String sfZzjg;
172	172	//诊治日期
173		- private String sfZlrq;
	173	+ private Date sfZlrq;
174	174	//接受治疗情况
175	175	private String sfJszl;
176	176	//检査机构
...	...	@@ -178,7 +178,8 @@
178	178	//检查人员
179	179	private String sfJcry;
180	180	//检査日期
181		- private String sfJcsj;
	181	+ private Date sfJcsj;
	182	+
182	183	private Date modified;
183	184	private Date created;
184	185	//操作人
...	...	@@ -188,6 +189,30 @@
188	189	*/
189	190	private Integer yn;
190	191
	192	+ public Date getRxlJcrq() {
	193	+ return rxlJcrq;
	194	+ }
	195	+
	196	+ public void setRxlJcrq(Date rxlJcrq) {
	197	+ this.rxlJcrq = rxlJcrq;
	198	+ }
	199	+
	200	+ public Date getSfJcrq() {
	201	+ return sfJcrq;
	202	+ }
	203	+
	204	+ public void setSfJcrq(Date sfJcrq) {
	205	+ this.sfJcrq = sfJcrq;
	206	+ }
	207	+
	208	+ public Date getSfZlrq() {
	209	+ return sfZlrq;
	210	+ }
	211	+
	212	+ public void setSfZlrq(Date sfZlrq) {
	213	+ this.sfZlrq = sfZlrq;
	214	+ }
	215	+
191	216	public String getHospitalId() {
192	217	return hospitalId;
193	218	}
...	...	@@ -676,14 +701,6 @@
676	701	this.rxlJcry = rxlJcry;
677	702	}
678	703
679		- public String getRxlJcrq() {
680		- return rxlJcrq;
681		- }
682		-
683		- public void setRxlJcrq(String rxlJcrq) {
684		- this.rxlJcrq = rxlJcrq;
685		- }
686		-
687	704	public String getRxPgz() {
688	705	return rxPgz;
689	706	}
...	...	@@ -740,14 +757,6 @@
740	757	this.sfBlzd = sfBlzd;
741	758	}
742	759
743		- public String getSfJcrq() {
744		- return sfJcrq;
745		- }
746		-
747		- public void setSfJcrq(String sfJcrq) {
748		- this.sfJcrq = sfJcrq;
749		- }
750		-
751	760	public String getSfZhzd() {
752	761	return sfZhzd;
753	762	}
754	763
...	...	@@ -772,14 +781,7 @@
772	781	this.sfZzjg = sfZzjg;
773	782	}
774	783
775		- public String getSfZlrq() {
776		- return sfZlrq;
777		- }
778	784
779		- public void setSfZlrq(String sfZlrq) {
780		- this.sfZlrq = sfZlrq;
781		- }
782		-
783	785	public String getSfJszl() {
784	786	return sfJszl;
785	787	}
...	...	@@ -788,6 +790,14 @@
788	790	this.sfJszl = sfJszl;
789	791	}
790	792
	793	+ public Date getSfJcsj() {
	794	+ return sfJcsj;
	795	+ }
	796	+
	797	+ public void setSfJcsj(Date sfJcsj) {
	798	+ this.sfJcsj = sfJcsj;
	799	+ }
	800	+
791	801	public String getSfJcjg() {
792	802	return sfJcjg;
793	803	}
...	...	@@ -802,14 +812,6 @@
802	812
803	813	public void setSfJcry(String sfJcry) {
804	814	this.sfJcry = sfJcry;
805		- }
806		-
807		- public String getSfJcsj() {
808		- return sfJcsj;
809		- }
810		-
811		- public void setSfJcsj(String sfJcsj) {
812		- this.sfJcsj = sfJcsj;
813	815	}
814	816
815	817	public Date getModified() {

...	...	@@ -143,7 +143,7 @@
143	143	//检査人员
144	144	private String rxlJcry;
145	145	//检査日期
146		- private String rxlJcrq;
	146	+ private Date rxlJcrq;
147	147	//(四〉乳腺X线检査（未作X线检査不填写此项）
148	148	//乳腺X线评估左
149	149	private String rxPgz;
...	...	@@ -161,7 +161,7 @@
161	161	//病理诊断者
162	162	private String sfBlzd;
163	163	//病理检査日期
164		- private String sfJcrq;
	164	+ private Date sfJcrq;
165	165	//最后诊断
166	166	private String sfZhzd;
167	167	//TNM分期
...	...	@@ -169,7 +169,7 @@
169	169	//诊治机构
170	170	private String sfZzjg;
171	171	//诊治日期
172		- private String sfZlrq;
	172	+ private Date sfZlrq;
173	173	//接受治疗情况
174	174	private String sfJszl;
175	175	//检査机构
...	...	@@ -177,7 +177,7 @@
177	177	//检查人员
178	178	private String sfJcry;
179	179	//检査日期
180		- private String sfJcsj;
	180	+ private Date sfJcsj;
181	181	/**
182	182	* 是否有效
183	183	*/
...	...	@@ -712,14 +712,6 @@
712	712	this.rxlJcry = rxlJcry;
713	713	}
714	714
715		- public String getRxlJcrq() {
716		- return rxlJcrq;
717		- }
718		-
719		- public void setRxlJcrq(String rxlJcrq) {
720		- this.rxlJcrq = rxlJcrq;
721		- }
722		-
723	715	public String getRxPgz() {
724	716	return rxPgz;
725	717	}
...	...	@@ -776,14 +768,6 @@
776	768	this.sfBlzd = sfBlzd;
777	769	}
778	770
779		- public String getSfJcrq() {
780		- return sfJcrq;
781		- }
782		-
783		- public void setSfJcrq(String sfJcrq) {
784		- this.sfJcrq = sfJcrq;
785		- }
786		-
787	771	public String getSfZhzd() {
788	772	return sfZhzd;
789	773	}
790	774
791	775
...	...	@@ -808,14 +792,34 @@
808	792	this.sfZzjg = sfZzjg;
809	793	}
810	794
811		- public String getSfZlrq() {
	795	+ public Date getRxlJcrq() {
	796	+ return rxlJcrq;
	797	+ }
	798	+
	799	+ public void setRxlJcrq(Date rxlJcrq) {
	800	+ this.rxlJcrq = rxlJcrq;
	801	+ }
	802	+
	803	+ public Date getSfJcrq() {
	804	+ return sfJcrq;
	805	+ }
	806	+
	807	+ public void setSfJcrq(Date sfJcrq) {
	808	+ this.sfJcrq = sfJcrq;
	809	+ }
	810	+
	811	+ public Date getSfZlrq() {
812	812	return sfZlrq;
813	813	}
814	814
815		- public void setSfZlrq(String sfZlrq) {
	815	+ public void setSfZlrq(Date sfZlrq) {
816	816	this.sfZlrq = sfZlrq;
817	817	}
818	818
	819	+ public void setSfJcsj(Date sfJcsj) {
	820	+ this.sfJcsj = sfJcsj;
	821	+ }
	822	+
819	823	public String getSfJszl() {
820	824	return sfJszl;
821	825	}
822	826
...	...	@@ -840,13 +844,8 @@
840	844	this.sfJcry = sfJcry;
841	845	}
842	846
843		- public String getSfJcsj() {
	847	+ public Date getSfJcsj() {
844	848	return sfJcsj;
845	849	}
846		-
847		- public void setSfJcsj(String sfJcsj) {
848		- this.sfJcsj = sfJcsj;
849		- }
850		-
851	850	}

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import com.lyms.platform.biz.service.BasicConfigService;
4	4	import com.lyms.platform.biz.service.CancerScreeningService;
	5	+import com.lyms.platform.biz.service.ResidentsArchiveService;
	6	+import com.lyms.platform.common.constants.ErrorCodeConstants;
5	7	import com.lyms.platform.common.enums.YnEnums;
6	8	import com.lyms.platform.common.result.BaseResponse;
7	9	import com.lyms.platform.common.utils.DateUtil;
8	10
...	...	@@ -11,16 +13,14 @@
11	13	import com.lyms.platform.permission.model.Users;
12	14	import com.lyms.platform.permission.service.UsersService;
13	15	import com.lyms.platform.pojo.CancerScreeningModel;
	16	+import com.lyms.platform.pojo.ResidentsArchiveModel;
14	17	import com.lyms.platform.query.CancerScreeningQuery;
15	18	import org.apache.commons.collections.CollectionUtils;
16	19	import org.apache.commons.collections.map.HashedMap;
17	20	import org.springframework.beans.factory.annotation.Autowired;
18	21	import org.springframework.stereotype.Component;
19	22
20		-import java.util.ArrayList;
21		-import java.util.HashMap;
22		-import java.util.List;
23		-import java.util.Map;
	23	+import java.util.*;
24	24
25	25	/**
26	26	* @auther yangfei
27	27
28	28
...	...	@@ -37,14 +37,17 @@
37	37	private UsersService usersService;
38	38	@Autowired
39	39	private BasicConfigService basicConfigService;
	40	+ @Autowired
	41	+ private ResidentsArchiveService residentsArchiveService;
40	42
41	43	/**
42	44	* 获取当前医院或院组内的两癌检查列表
	45	+ *
43	46	* @param queryRequest
44	47	* @param id
45	48	* @return
46	49	*/
47		- public BaseResponse list(CancerScreeningRequest queryRequest,Integer id) {
	50	+ public BaseResponse list(CancerScreeningRequest queryRequest, Integer id) {
48	51
49	52	//根据用户id获取医院ID
50	53	String hospitalId = autoMatchFacade.getHospitalId(id);
...	...	@@ -55,7 +58,7 @@
55	58	query.setNeed("need");
56	59	query.setYn(YnEnums.YES.getId());
57	60	query.setQueryNo(queryRequest.getQueryNo());
58		- if (hospitalId!=null){
	61	+ if (hospitalId != null) {
59	62	query.setHospitalId(hospitalId);
60	63	}
61	64	query.setProvinceId(queryRequest.getProvinceId());
62	65
63	66
...	...	@@ -63,15 +66,16 @@
63	66	query.setAreaId(queryRequest.getAreaId());
64	67
65	68	List<CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
66		- if (CollectionUtils.isNotEmpty(modelList)){
67		- for (CancerScreeningModel model : modelList){
68		- Map<String,Object> map = new HashMap<>();
69		- map.put("id",model.getId());
70		- map.put("name",model.getUsername());
	69	+ if (CollectionUtils.isNotEmpty(modelList)) {
	70	+ for (CancerScreeningModel model : modelList) {
	71	+ Map<String, Object> map = new HashMap<>();
	72	+ map.put("id", model.getId());
	73	+ map.put("name", model.getUsername());
71	74	map.put("cardNum", FunvCommonUtil.getId(model.getCertificateNum()));
72	75	map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
73		- map.put("age",DateUtil.getAge(model.getBirthday()));
	76	+ map.put("age", DateUtil.getAge(model.getBirthday()));
74	77	map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
	78	+ map.put("sfZhzd",model.getSfZhzd());
75	79	}
76	80	}
77	81	return new BaseResponse();
78	82
79	83
...	...	@@ -79,21 +83,22 @@
79	83
80	84	/**
81	85	* 获取妇女两癌筛查列表
	86	+ *
82	87	* @param residentId
83	88	* @return
84	89	*/
85	90	public BaseResponse getResIdCancerScreenList(String residentId) {
86	91	BaseResponse baseResponse = new BaseResponse();
87	92	List<CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(residentId);
88		- List<Map<String,String>> hisCancerScrList = new ArrayList<>();
89		- for(CancerScreeningModel cs:cancerScreeningModels){
90		- Map<String,String> map = new HashedMap();
91		- map.put("id",cs.getId());
	93	+ List<Map<String, String>> hisCancerScrList = new ArrayList<>();
	94	+ for (CancerScreeningModel cs : cancerScreeningModels) {
	95	+ Map<String, String> map = new HashedMap();
	96	+ map.put("id", cs.getId());
92	97	map.put("createTime", DateUtil.getyyyy_MM_dd(cs.getCreated()));
93	98	//根据用户id获取医院ID
94	99	Users users = usersService.getUsers(cs.getOperator());
95		- if(users!=null){
96		- map.put("operUser",users.getName());
	100	+ if (users != null) {
	101	+ map.put("operUser", users.getName());
97	102	}
98	103	hisCancerScrList.add(map);
99	104	}
100	105
101	106
102	107
103	108
...	...	@@ -104,25 +109,70 @@
104	109
105	110	/**
106	111	* 获取两癌筛查详情
	112	+ *
107	113	* @param id
108	114	* @return
109	115	*/
110	116	public BaseResponse getCancerScreenInfo(String id) {
	117	+ BaseResponse baseResponse = new BaseResponse();
111	118	CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id);
112		- return new BaseResponse();
	119	+ baseResponse.setObject(cancerScreeningModel);
	120	+ return baseResponse;
113	121	}
114	122
115	123	public BaseResponse updateCancerScreen(CancerScreeningModel cancerScr, Integer id) {
116		- return new BaseResponse();
	124	+ try {
	125	+ cancerScr.setOperator(id);
	126	+ cancerScreenService.updateOneCancerScreen(cancerScr,cancerScr.getId());
	127	+ return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
	128	+ } catch (Exception e) {
	129	+ e.printStackTrace();
	130	+ return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR);
	131	+ }
117	132	}
118	133
119	134	public BaseResponse addCancerScreen(CancerScreeningModel cancerScr, Integer id) {
120		- //根据用户id获取医院ID
121		- String hospitalId = autoMatchFacade.getHospitalId(id);
122		-
123		-
124		-
125		- return new BaseResponse();
	135	+ try {
	136	+ ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.getResident(cancerScr.getResidentId());
	137	+ //冗余妇女建档数据
	138	+ if(residentsArchiveModel!=null){
	139	+ //姓名
	140	+ cancerScr.setUsername(residentsArchiveModel.getUsername());
	141	+ //出生日期
	142	+ cancerScr.setBirthday(residentsArchiveModel.getBirthday());
	143	+ //民族Id
	144	+ cancerScr.setNationId(residentsArchiveModel.getNationId());
	145	+ //身份证件号
	146	+ cancerScr.setCertificateNum(residentsArchiveModel.getCertificateNum());
	147	+ //文化程度
	148	+ cancerScr.setLevelTypeId(residentsArchiveModel.getLevelTypeId());
	149	+ //手机号
	150	+ cancerScr.setPhone(residentsArchiveModel.getPhone());
	151	+ //居住地
	152	+ cancerScr.setProvinceId(residentsArchiveModel.getProvinceId());
	153	+ //市
	154	+ cancerScr.setCityId(residentsArchiveModel.getCityId());
	155	+ //区
	156	+ cancerScr.setAreaId(residentsArchiveModel.getAreaId());
	157	+ //街道
	158	+ cancerScr.setStreetId(residentsArchiveModel.getStreetId());
	159	+ //详细
	160	+ cancerScr.setAddress(residentsArchiveModel.getAddress());
	161	+ //根据用户id获取医院ID
	162	+ String hospitalId = autoMatchFacade.getHospitalId(id);
	163	+ //医院id
	164	+ cancerScr.setHospitalId(hospitalId);
	165	+ //操作人的id
	166	+ cancerScr.setOperator(id);
	167	+ cancerScreenService.addOneCancerScreen(cancerScr);
	168	+ return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
	169	+ }else{
	170	+ return new BaseResponse("未传入的妇女建档id", ErrorCodeConstants.SUCCESS);
	171	+ }
	172	+ } catch (Exception e) {
	173	+ e.printStackTrace();
	174	+ return new BaseResponse(e.getMessage(), ErrorCodeConstants.SYSTEM_ERROR);
	175	+ }
126	176	}
127	177	}

...	...	@@ -151,6 +151,8 @@
151	151	if (archiveModel!=null){
152	152	archiveMap = new HashMap<>();
153	153	archiveMap.put("certificateNum", archiveModel.getCertificateNum());
	154	+ archiveMap.put("archId", archiveModel.getId());
	155	+ archiveMap.put("levelType", FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService));
154	156	archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
155	157	archiveMap.put("username", archiveModel.getUsername());
156	158	archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday()));

...	...	@@ -30,6 +30,8 @@
30	30	import java.util.*;
31	31
32	32	/**
	33	+ *
	34	+ * 妇女健康档案管理
33	35	* Created by Administrator on 2016/12/20 0020.
34	36	*/
35	37	@Component

...	...	@@ -8,11 +8,11 @@
8	8	public class CancerScreeningRequest extends BasePageQueryRequest {
9	9
10	10	/**
11		- * 孕周开始日期
	11	+ * 检查时间
12	12	*/
13	13	private Integer checkDateStart;
14	14	/**
15		- * 孕周结束日期
	15	+ * 检查时间
16	16	*/
17	17	private Integer checkDateEnd;
18	18	/**