jiangjiazhi / regional-platform

Commit 5caed9104499290f14fb303870e909aaa070d7e7

Authored by baohanddd over 8 years ago

Exists in master and in 8 other branches

add lis pacs check query

Showing 4 changed files with 55 additions and 53 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4	3
5	4	/**
6	5	* Created by Administrator on 2016/9/9 0009.
...	...	@@ -37,12 +36,12 @@
37	36	private String P_ADMISSIONNUM;
38	37	private String P_REPORTTYPENAME;
39	38	private String P_APPLATIONDOCNAME;
40		- private Date P_REPORTISSUETIME;
41		- private Date P_APPLATIONTIME;
42		- private Date P_REPORTTIME;
43		- private Date P_CHECKTIME;
44		- private Date MODIFIED;
45		- private Integer STATUS;
	39	+ private String P_REPORTISSUETIME;
	40	+ private String P_APPLATIONTIME;
	41	+ private String P_REPORTTIME;
	42	+ private String P_CHECKTIME;
	43	+ private String MODIFIED;
	44	+ private String STATUS;
46	45
47	46	public String getP_TITLE() {
48	47	return P_TITLE;
49	48
50	49
51	50
52	51
53	52
54	53
55	54
56	55
57	56
58	57
59	58
...	...	@@ -140,51 +139,51 @@
140	139	P_APPLATIONDOCNAME = p_APPLATIONDOCNAME;
141	140	}
142	141
143		- public Date getP_REPORTISSUETIME() {
	142	+ public String getP_REPORTISSUETIME() {
144	143	return P_REPORTISSUETIME;
145	144	}
146	145
147		- public void setP_REPORTISSUETIME(Date p_REPORTISSUETIME) {
	146	+ public void setP_REPORTISSUETIME(String p_REPORTISSUETIME) {
148	147	P_REPORTISSUETIME = p_REPORTISSUETIME;
149	148	}
150	149
151		- public Date getP_APPLATIONTIME() {
	150	+ public String getP_APPLATIONTIME() {
152	151	return P_APPLATIONTIME;
153	152	}
154	153
155		- public void setP_APPLATIONTIME(Date p_APPLATIONTIME) {
	154	+ public void setP_APPLATIONTIME(String p_APPLATIONTIME) {
156	155	P_APPLATIONTIME = p_APPLATIONTIME;
157	156	}
158	157
159		- public Date getP_REPORTTIME() {
	158	+ public String getP_REPORTTIME() {
160	159	return P_REPORTTIME;
161	160	}
162	161
163		- public void setP_REPORTTIME(Date p_REPORTTIME) {
	162	+ public void setP_REPORTTIME(String p_REPORTTIME) {
164	163	P_REPORTTIME = p_REPORTTIME;
165	164	}
166	165
167		- public Date getP_CHECKTIME() {
	166	+ public String getP_CHECKTIME() {
168	167	return P_CHECKTIME;
169	168	}
170	169
171		- public void setP_CHECKTIME(Date p_CHECKTIME) {
	170	+ public void setP_CHECKTIME(String p_CHECKTIME) {
172	171	P_CHECKTIME = p_CHECKTIME;
173	172	}
174	173
175		- public Date getMODIFIED() {
	174	+ public String getMODIFIED() {
176	175	return MODIFIED;
177	176	}
178	177
179		- public void setMODIFIED(Date MODIFIED) {
	178	+ public void setMODIFIED(String MODIFIED) {
180	179	this.MODIFIED = MODIFIED;
181	180	}
182	181
183		- public Integer getSTATUS() {
	182	+ public String getSTATUS() {
184	183	return STATUS;
185	184	}
186	185
187		- public void setSTATUS(Integer STATUS) {
	186	+ public void setSTATUS(String STATUS) {
188	187	this.STATUS = STATUS;
189	188	}
190	189	}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4		-
5	3	/**
6	4	* Created by Administrator on 2016/9/9 0009.
7	5	* 字段名称字段类型字段描述
...	...	@@ -31,9 +29,9 @@
31	29	private String P_ITEMRESULT;
32	30	private String P_UNIT;
33	31	private String P_CODERESULT;
34		- private Date P_REPORTTIME;
35		- private Integer P_PRINTORDER;
36		- private Integer P_PRINTGROUP;
	32	+ private String P_REPORTTIME;
	33	+ private String P_PRINTORDER;
	34	+ private String P_PRINTGROUP;
37	35
38	36	public String getP_APPLICATIONNUM() {
39	37	return P_APPLICATIONNUM;
40	38
41	39
42	40
43	41
44	42
...	...	@@ -115,27 +113,27 @@
115	113	P_CODERESULT = p_CODERESULT;
116	114	}
117	115
118		- public Date getP_REPORTTIME() {
	116	+ public String getP_REPORTTIME() {
119	117	return P_REPORTTIME;
120	118	}
121	119
122		- public void setP_REPORTTIME(Date p_REPORTTIME) {
	120	+ public void setP_REPORTTIME(String p_REPORTTIME) {
123	121	P_REPORTTIME = p_REPORTTIME;
124	122	}
125	123
126		- public Integer getP_PRINTORDER() {
	124	+ public String getP_PRINTORDER() {
127	125	return P_PRINTORDER;
128	126	}
129	127
130		- public void setP_PRINTORDER(Integer p_PRINTORDER) {
	128	+ public void setP_PRINTORDER(String p_PRINTORDER) {
131	129	P_PRINTORDER = p_PRINTORDER;
132	130	}
133	131
134		- public Integer getP_PRINTGROUP() {
	132	+ public String getP_PRINTGROUP() {
135	133	return P_PRINTGROUP;
136	134	}
137	135
138		- public void setP_PRINTGROUP(Integer p_PRINTGROUP) {
	136	+ public void setP_PRINTGROUP(String p_PRINTGROUP) {
139	137	P_PRINTGROUP = p_PRINTGROUP;
140	138	}
141	139	}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import com.lyms.platform.common.utils.DateUtil;
4	3
5		-import java.util.Date;
6		-
7	4	/**
8	5	* Created by Administrator on 2016/9/9 0009.
9	6	* SICK_KIND VARCHAR2 患者类别," 儿童"或者"孕妇"
...	...	@@ -20,7 +17,7 @@
20	17	APPLY_DOCTOR VARCHAR2 申请医生
21	18	EXECUTE_DEPT VARCHAR2 执行科室名称
22	19	EXECUTE_MAN VARCHAR2 执行人
23		- APPLY_TIME Date 申请时间(检查时间)
	20	+ APPLY_TIME String 申请时间(检查时间)
24	21	STATUS NUMBER 1:申请中,2:检查中,3:诊断完成
25	22	MODIFIED DATE 最后修改时间
26	23	ITEM_RESULT,ITEM_FINDING,IMGS,P_TITLE
...	...	@@ -40,10 +37,10 @@
40	37	private String APPLY_DOCTOR;
41	38	private String EXECUTE_DEPT;
42	39	private String EXECUTE_MAN;
43		- private Integer AGE;
44		- private Integer STATUS;
45		- private Date APPLY_TIME;
46		- private Date MODIFIED;
	40	+ private String AGE;
	41	+ private String STATUS;
	42	+ private String APPLY_TIME;
	43	+ private String MODIFIED;
47	44	private String ITEM_RESULT;
48	45	private String ITEM_FINDING;
49	46	private String IMGS;
50	47
51	48
52	49
53	50
54	51
55	52
56	53
...	...	@@ -153,36 +150,36 @@
153	150	this.EXECUTE_MAN = EXECUTE_MAN;
154	151	}
155	152
156		- public Integer getAGE() {
	153	+ public String getAGE() {
157	154	return AGE;
158	155	}
159	156
160		- public void setAGE(Integer AGE) {
	157	+ public void setAGE(String AGE) {
161	158	this.AGE = AGE;
162	159	}
163	160
164		- public Integer getSTATUS() {
	161	+ public String getSTATUS() {
165	162	return STATUS;
166	163	}
167	164
168		- public void setSTATUS(Integer STATUS) {
	165	+ public void setSTATUS(String STATUS) {
169	166	this.STATUS = STATUS;
170	167	}
171	168
172		- public Date getAPPLY_TIME() {
	169	+ public String getAPPLY_TIME() {
173	170	return APPLY_TIME;
174	171	}
175	172
176	173	public void setAPPLY_TIME(String APPLY_TIME) {
177		- this.APPLY_TIME = DateUtil.parseYMDHMS(APPLY_TIME);
	174	+ this.APPLY_TIME = APPLY_TIME;
178	175	}
179	176
180		- public Date getMODIFIED() {
	177	+ public String getMODIFIED() {
181	178	return MODIFIED;
182	179	}
183	180
184	181	public void setMODIFIED(String MODIFIED) {
185		- this.MODIFIED = DateUtil.parseYMDHMS(MODIFIED);
	182	+ this.MODIFIED = MODIFIED;
186	183	}
187	184
188	185	public String getITEM_RESULT() {

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.hospitalapi.pojo.*;
4	4	import com.lyms.hospitalapi.v2.*;
5	5	import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.common.utils.JsonUtil;
6	7	import org.apache.commons.dbutils.DbUtils;
7	8	import org.apache.commons.dbutils.QueryRunner;
8	9	import org.apache.commons.dbutils.handlers.BeanListHandler;
...	...	@@ -29,7 +30,7 @@
29	30	List<CheckResponse> list = new ArrayList<>();
30	31	Date tempDate = null;
31	32	for (CheckResponse check:result) {
32		- if (check.getModified().equals(tempDate)) {
	33	+ if (check.getModified() != null && check.getModified().equals(tempDate)) {
33	34	continue;
34	35	}
35	36	list.add(check);
...	...	@@ -39,6 +40,12 @@
39	40	// 排序
40	41	Collections.sort(list, new Comparator() {
41	42	public int compare(Object a, Object b) {
	43	+ if (((CheckResponse)a).getModified() == null) {
	44	+ return 0;
	45	+ }
	46	+ if (((CheckResponse)b).getModified() == null) {
	47	+ return 0;
	48	+ }
42	49	if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
43	50	return 1;
44	51	}
...	...	@@ -78,6 +85,7 @@
78	85	CheckResult checkResult = new CheckResult();
79	86	checkResult.setJianyan(dayMap.get("jianyan"));
80	87	checkResult.setYingxiang(dayMap.get("yingxiang"));
	88	+ checkResult.setYmd(key);
81	89	resultList.add(checkResult);
82	90	}
83	91	}
84	92
...	...	@@ -98,13 +106,13 @@
98	106	List<LisCheckResult> resultList = queryRunner.query(conn, "select * from lis_check_result where P_APPLICATIONNUM = '"+info.getP_APPLICATIONNUM()+"'", new BeanListHandler<LisCheckResult>(LisCheckResult.class));
99	107	if (resultList != null && resultList.size() > 0) {
100	108	CheckResponse check = new CheckResponse();
101		- check.setModified(info.getMODIFIED());
	109	+ check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED()));
102	110	check.setType(1);
103	111	check.setName(info.getP_NAME());
104	112	check.setTitle(info.getP_TITLE());
105	113	check.setAge(info.getP_AGE());
106		- check.setApplyDate(info.getP_CHECKTIME());
107		- check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getP_CHECKTIME()));
	114	+ check.setApplyDate(DateUtil.parseYMDHMS(info.getP_CHECKTIME()));
	115	+ check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getP_CHECKTIME())));
108	116	check.setCheckDept(info.getP_CHECKDEPARTNAME());
109	117	check.setDoctor(info.getP_APPLATIONDOCNAME());
110	118	if ("1".equals(info.getP_SEX())) {
111	119
...	...	@@ -151,14 +159,14 @@
151	159	for (RisCheckInfo info:list) {
152	160	if (StringUtils.isNotBlank(info.getITEM_RESULT())) {
153	161	CheckResponse check = new CheckResponse();
154		- check.setModified(info.getMODIFIED());
	162	+ check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED()));
155	163	check.setType(2);
156	164	check.setName(info.getNAME());
157	165	if (info.getAGE() != null) {
158	166	check.setAge(info.getAGE().toString());
159	167	}
160		- check.setApplyDate(info.getAPPLY_TIME());
161		- check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getAPPLY_TIME()));
	168	+ check.setApplyDate(DateUtil.parseYMDHMS(info.getAPPLY_TIME()));
	169	+ check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getAPPLY_TIME())));
162	170	check.setCheckDept(info.getAPPLY_DEPT());
163	171	check.setDoctor(info.getEXECUTE_MAN());
164	172	if ("F".equals(info.getSEX())) {