jiangjiazhi / regional-platform

Commit 94619a49984536430bb1d56d069e4e105170318a

Authored by jiangjiazhi over 8 years ago

Exists in master and in 6 other branches

区分常用

Showing 4 changed files with 116 additions and 170 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.List;
	9	+import java.util.Map;
9	10
10	11	/**
11	12	* 产前检查初诊模型
...	...	@@ -21,6 +22,10 @@
21	22	private String id;
22	23	private String parentId;
23	24	private String pid;
	25	+ //实验结果选择
	26	+ private String syjgSelect;
	27	+ //hiv 抗体
	28	+ private String hivktSelect;
24	29	//新生儿死亡备注
25	30	private String neoDeathTodo;
26	31	//出生缺陷儿备注
...	...	@@ -143,6 +148,32 @@
143	148
144	149	//甲状腺过氧化物酶抗体
145	150	private String jzxgyhwmkt;
	151	+ //传染病史
	152	+ private String infectDiseases;
	153	+
	154	+ public String getInfectDiseases() {
	155	+ return infectDiseases;
	156	+ }
	157	+
	158	+ public void setInfectDiseases(String infectDiseases) {
	159	+ this.infectDiseases = infectDiseases;
	160	+ }
	161	+
	162	+ public String getSyjgSelect() {
	163	+ return syjgSelect;
	164	+ }
	165	+
	166	+ public void setSyjgSelect(String syjgSelect) {
	167	+ this.syjgSelect = syjgSelect;
	168	+ }
	169	+
	170	+ public String getHivktSelect() {
	171	+ return hivktSelect;
	172	+ }
	173	+
	174	+ public void setHivktSelect(String hivktSelect) {
	175	+ this.hivktSelect = hivktSelect;
	176	+ }
146	177
147	178	public String getCjzxs() {
148	179	return cjzxs;

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.common.utils.SystemConfig;
12	12	import com.lyms.platform.operate.web.request.*;
13	13	import com.lyms.platform.operate.web.result.*;
	14	+import com.lyms.platform.operate.web.utils.InitDataUtils;
14	15	import com.lyms.platform.permission.model.Organization;
15	16	import com.lyms.platform.permission.model.Users;
16	17	import com.lyms.platform.permission.service.CouponService;
17	18
18	19
19	20
20	21
21	22
22	23
23	24
...	...	@@ -2252,26 +2253,27 @@
2252	2253
2253	2254	public BaseResponse getEnums() {
2254	2255	Map<String, Object> map = new HashMap<>();
2255		- map.put("getFetPosition", getFetPosition());
2256		- map.put("getFetal", getFetal());
2257		- map.put("getJoin", getJoin());
2258		- map.put("getTaiPan", getTaiPan());
2259		- map.put("getTaiShu", getTaiShu());
2260		- map.put("fuzhong", getFuZhong());
	2256	+ map.put("getFetPosition", InitDataUtils.getFetPosition());
	2257	+ map.put("getFetal",InitDataUtils. getFetal());
	2258	+ map.put("getJoin", InitDataUtils.getJoin());
	2259	+ map.put("getTaiPan",InitDataUtils. getTaiPan());
	2260	+ map.put("getTaiShu",InitDataUtils. getTaiShu());
	2261	+ map.put("fuzhong", InitDataUtils.getFuZhong());
2261	2262	//胎膜
2262		- map.put("getTaiMo", getTm());
	2263	+ map.put("getTaiMo",InitDataUtils. getTm());
2263	2264	//宫颈硬度
2264		- map.put("getGjyd", getGJYD());
	2265	+ map.put("getGjyd", InitDataUtils.getGJYD());
2265	2266	//宫颈位置
2266		- map.put("getGjwz", getGJWZ());
	2267	+ map.put("getGjwz",InitDataUtils. getGJWZ());
2267	2268	//先露位置
2268		- map.put("getXlwz", getXLWZ());
	2269	+ map.put("getXlwz",InitDataUtils. getXLWZ());
2269	2270	//阴道检测
2270		- map.put("getYdjc", getYDJC());
	2271	+ map.put("getYdjc", InitDataUtils.getYDJC());
2271	2272	//宫高
2272		- map.put("getGongGao", getGongGao());
	2273	+ map.put("getGongGao",InitDataUtils. getGongGao());
2273	2274	//横指
2274		- map.put("getHengZhi", getHengZhi());
	2275	+ map.put("getHengZhi",InitDataUtils. getHengZhi());
	2276	+ map.put("getSyjg", InitDataUtils.getSyjg());
2275	2277	map.put("getHighRisk", basicConfigFacade.getHighRisk());
2276	2278	map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID));
2277	2279	map.put("xx", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING));
...	...	@@ -2283,18 +2285,6 @@
2283	2285	return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
2284	2286	}
2285	2287
2286		- //胎数
2287		- public List getTaiShu() {
2288		- List<Object> list = new ArrayList<>();
2289		- for (TaiShuEnums enums : TaiShuEnums.values()) {
2290		- Map<String, Object> resultMap = new HashMap<>();
2291		- resultMap.put("id", enums.getId());
2292		- resultMap.put("name", enums.getName());
2293		- list.add(resultMap);
2294		- }
2295		- return list;
2296		- }
2297		-
2298	2288	public List convert() {
2299	2289	List<Organization> organization = organizationService.queryHospital();
2300	2290	List data = new ArrayList();
...	...	@@ -2308,149 +2298,5 @@
2308	2298	}
2309	2299	return data;
2310	2300	}
2311		-
2312		- public List<Object> getFuZhong() {
2313		- List<Object> list = new ArrayList<>();
2314		- for (FuZhongEnums enums : FuZhongEnums.values()) {
2315		- Map<String, Object> resultMap = new HashMap<>();
2316		- resultMap.put("id", enums.getId());
2317		- resultMap.put("name", enums.getName());
2318		- list.add(resultMap);
2319		- }
2320		- return list;
2321		- }
2322		-
2323		- //胎膜
2324		- public List<Object> getTm() {
2325		- List<Object> list = new ArrayList<>();
2326		- for (TaiShuEnums.TmEnums enums : TaiShuEnums.TmEnums.values()) {
2327		- Map<String, Object> resultMap = new HashMap<>();
2328		- resultMap.put("id", enums.getId());
2329		- resultMap.put("name", enums.getName());
2330		- list.add(resultMap);
2331		- }
2332		- return list;
2333		- }
2334		- //宫颈硬度
2335		- public List<Object> getGJYD() {
2336		- List<Object> list = new ArrayList<>();
2337		- for (GongJingEnums.YinDu enums : GongJingEnums.YinDu.values()) {
2338		- Map<String, Object> resultMap = new HashMap<>();
2339		- resultMap.put("id", enums.getValue());
2340		- resultMap.put("name", enums.getName());
2341		- list.add(resultMap);
2342		- }
2343		- return list;
2344		- }
2345		- //宫颈位置
2346		- public List<Object> getGJWZ() {
2347		- List<Object> list = new ArrayList<>();
2348		- for (GongJingEnums.WeiZhi enums : GongJingEnums.WeiZhi.values()) {
2349		- Map<String, Object> resultMap = new HashMap<>();
2350		- resultMap.put("id", enums.getValue());
2351		- resultMap.put("name", enums.getName());
2352		- list.add(resultMap);
2353		- }
2354		- return list;
2355		- }
2356		-
2357		- //先露位置
2358		- public List<Object> getXLWZ() {
2359		- List<Object> list = new ArrayList<>();
2360		- for (GongJingEnums.XLWeiZhi enums : GongJingEnums.XLWeiZhi.values()) {
2361		- Map<String, Object> resultMap = new HashMap<>();
2362		- resultMap.put("id", enums.getValue());
2363		- resultMap.put("name", enums.getName());
2364		- list.add(resultMap);
2365		- }
2366		- return list;
2367		- }
2368		-
2369		- //阴道检测
2370		- public List<Object> getYDJC() {
2371		- List<Object> list = new ArrayList<>();
2372		- for (GongJingEnums.YDJianCe enums : GongJingEnums.YDJianCe.values()) {
2373		- Map<String, Object> resultMap = new HashMap<>();
2374		- resultMap.put("id", enums.getValue());
2375		- resultMap.put("name", enums.getName());
2376		- list.add(resultMap);
2377		- }
2378		- return list;
2379		- }
2380		-
2381		- //宫高
2382		- public List<Object> getGongGao() {
2383		- List<Object> list = new ArrayList<>();
2384		- for (GongJingEnums.GongGao enums : GongJingEnums.GongGao.values()) {
2385		- Map<String, Object> resultMap = new HashMap<>();
2386		- resultMap.put("id", enums.getValue());
2387		- resultMap.put("name", enums.getName());
2388		- list.add(resultMap);
2389		- }
2390		- return list;
2391		- }
2392		-
2393		- //横指
2394		- public List<Object> getHengZhi() {
2395		- List<Object> list = new ArrayList<>();
2396		- for (GongJingEnums.HengZhi enums : GongJingEnums.HengZhi.values()) {
2397		- Map<String, Object> resultMap = new HashMap<>();
2398		- resultMap.put("id", enums.getValue());
2399		- resultMap.put("name", enums.getName());
2400		- list.add(resultMap);
2401		- }
2402		- return list;
2403		- }
2404		-
2405		-
2406		-
2407		- //胎方位
2408		- public List<Object> getFetPosition() {
2409		- List<Object> list = new ArrayList<>();
2410		- for (FetalPositionEnums enums : FetalPositionEnums.values()) {
2411		- Map<String, Object> resultMap = new HashMap<>();
2412		- resultMap.put("id", enums.getId());
2413		- resultMap.put("name", enums.getName());
2414		- list.add(resultMap);
2415		- }
2416		- return list;
2417		- }
2418		-
2419		- //胎先露
2420		- public List getFetal() {
2421		- List<Object> list = new ArrayList<>();
2422		- for (FetalEnums enums : FetalEnums.values()) {
2423		- Map<String, Object> resultMap = new HashMap<>();
2424		- resultMap.put("id", enums.getId());
2425		- resultMap.put("name", enums.getName());
2426		- list.add(resultMap);
2427		- }
2428		- return list;
2429		- }
2430		-
2431		- //衔接
2432		- public List getJoin() {
2433		- List<Object> list = new ArrayList<>();
2434		- for (JoinEnums enums : JoinEnums.values()) {
2435		- Map<String, Object> resultMap = new HashMap<>();
2436		- resultMap.put("id", enums.getId());
2437		- resultMap.put("name", enums.getName());
2438		- list.add(resultMap);
2439		- }
2440		- return list;
2441		- }
2442		-
2443		- //胎盘
2444		- public List getTaiPan() {
2445		- List<Object> list = new ArrayList<>();
2446		- for (TaiShuEnums.TaiPanEnums enums : TaiShuEnums.TaiPanEnums.values()) {
2447		- Map<String, Object> resultMap = new HashMap<>();
2448		- resultMap.put("id", enums.getId());
2449		- resultMap.put("name", enums.getName());
2450		- list.add(resultMap);
2451		- }
2452		- return list;
2453		- }
2454		-
2455	2301	}

...	...	@@ -28,6 +28,10 @@
28	28	private String id;
29	29
30	30	private String pid;
	31	+ //实验结果选择
	32	+ private String syjgSelect;
	33	+ //hiv 抗体
	34	+ private String hivktSelect;
31	35	//预产期
32	36	private String dueDate;
33	37	//末次月经
34	38
...	...	@@ -313,7 +317,33 @@
313	317	//出生缺陷儿备注
314	318	private String birthDefectTodo;
315	319
	320	+ //传染病史
	321	+ private Map infectDiseases;
316	322
	323	+ public String getSyjgSelect() {
	324	+ return syjgSelect;
	325	+ }
	326	+
	327	+ public void setSyjgSelect(String syjgSelect) {
	328	+ this.syjgSelect = syjgSelect;
	329	+ }
	330	+
	331	+ public String getHivktSelect() {
	332	+ return hivktSelect;
	333	+ }
	334	+
	335	+ public void setHivktSelect(String hivktSelect) {
	336	+ this.hivktSelect = hivktSelect;
	337	+ }
	338	+
	339	+ public Map getInfectDiseases() {
	340	+ return infectDiseases;
	341	+ }
	342	+
	343	+ public void setInfectDiseases(Map infectDiseases) {
	344	+ this.infectDiseases = infectDiseases;
	345	+ }
	346	+
317	347	public String getNeoDeathTodo() {
318	348	return neoDeathTodo;
319	349	}
...	...	@@ -1079,7 +1109,9 @@
1079	1109	antExChuModel.setBirthDefectTodo(birthDefectTodo);
1080	1110	antExChuModel.setDiagnosisOther(diagnosisOther);
1081	1111	antExChuModel.setBg(bg);
1082		-
	1112	+ antExChuModel.setHivktSelect(hivktSelect);
	1113	+ antExChuModel.setSyjgSelect(syjgSelect);
	1114	+ antExChuModel.setInfectDiseases(JsonUtil.obj2JsonString(infectDiseases));
1083	1115	// //早孕期病毒检测
1084	1116	// private String zyqbd;
1085	1117	// //nt检查

...	...	@@ -73,6 +73,12 @@
73	73	private Map ysfyHistory;
74	74
75	75	private Map hHealthInfo;
	76	+ //传染病史
	77	+ private Map infectDiseases;
	78	+ //实验结果选择
	79	+ private String syjgSelect;
	80	+ //hiv 抗体
	81	+ private String hivktSelect;
76	82	//孕次
77	83	private Integer pregnancyTimes;
78	84	// 产次
...	...	@@ -368,6 +374,30 @@
368	374	this.hasRefer = hasRefer;
369	375	}
370	376
	377	+ public Map getInfectDiseases() {
	378	+ return infectDiseases;
	379	+ }
	380	+
	381	+ public void setInfectDiseases(Map infectDiseases) {
	382	+ this.infectDiseases = infectDiseases;
	383	+ }
	384	+
	385	+ public String getSyjgSelect() {
	386	+ return syjgSelect;
	387	+ }
	388	+
	389	+ public void setSyjgSelect(String syjgSelect) {
	390	+ this.syjgSelect = syjgSelect;
	391	+ }
	392	+
	393	+ public String getHivktSelect() {
	394	+ return hivktSelect;
	395	+ }
	396	+
	397	+ public void setHivktSelect(String hivktSelect) {
	398	+ this.hivktSelect = hivktSelect;
	399	+ }
	400	+
371	401	public int getHasSieve() {
372	402	return hasSieve;
373	403	}
...	...	@@ -1094,6 +1124,13 @@
1094	1124	// private String s75gdgtt;
1095	1125	// //甲状腺功能
1096	1126	// private String jzxgn;
	1127	+ setHivktSelect(antExChuModel.getHivktSelect());
	1128	+ setSyjgSelect(antExChuModel.getSyjgSelect());
	1129	+ try {
	1130	+ setInfectDiseases(JsonUtil.jkstr2Obj(antExChuModel.getInfectDiseases(), Map.class));
	1131	+ } catch (Exception e) {
	1132	+ }
	1133	+
1097	1134	setZyqbdjc(antExChuModel.getZyqbd());
1098	1135	setNtjc(antExChuModel.getNtjc());
1099	1136	setCjsc(antExChuModel.getCjsc());