fangcheng / regional-platform

Commit 4b271d0d7efcfe6269118abe96281159ca8d9dd1

Authored by baohanddd over 8 years ago

1 parent b6eef20877

update assconfig table name

Showing 6 changed files with 127 additions and 27 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/LisCrisisItemDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/LisCrisisItemDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LisCrisisItemService.java
platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java
platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java

1	1	package com.lyms.platform.biz.dal;
2	2
3	3	import com.lyms.platform.common.dao.operator.MongoQuery;
	4	+import com.lyms.platform.pojo.Guidelines;
4	5	import com.lyms.platform.pojo.LisCrisisItem;
5	6
6	7	import java.util.List;
...	...	@@ -17,6 +18,8 @@
17	18	public int queryLisCrisisItemCount(MongoQuery query);
18	19
19	20	public List<LisCrisisItem> queryLisCrisisItem(MongoQuery query);
	21	+
	22	+ public void updateLisCrisisItem(LisCrisisItem obj, String id);
20	23
21	24	}

...	...	@@ -3,6 +3,8 @@
3	3	import com.lyms.platform.biz.dal.LisCrisisItemDao;
4	4	import com.lyms.platform.biz.dal.LisReportDao;
5	5	import com.lyms.platform.common.dao.BaseMongoDAOImpl;
	6	+import com.lyms.platform.common.dao.operator.MongoCondition;
	7	+import com.lyms.platform.common.dao.operator.MongoOper;
6	8	import com.lyms.platform.common.dao.operator.MongoQuery;
7	9	import com.lyms.platform.pojo.LisCrisisItem;
8	10	import com.lyms.platform.pojo.LisReport;
...	...	@@ -34,6 +36,11 @@
34	36	@Override
35	37	public List<LisCrisisItem> queryLisCrisisItem(MongoQuery query) {
36	38	return find(query.convertToMongoQuery());
	39	+ }
	40	+
	41	+ @Override
	42	+ public void updateLisCrisisItem(LisCrisisItem obj, String id) {
	43	+ update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
37	44	}
38	45	}

...	...	@@ -21,5 +21,9 @@
21	21	return lisCrisisItemDao.queryLisCrisisItem(query.convertToQuery());
22	22	}
23	23
	24	+ public void updateLisCrisisItem(LisCrisisItem obj, String id) {
	25	+ lisCrisisItemDao.updateLisCrisisItem(obj, id);
	26	+ }
	27	+
24	28	}

1	1	package com.lyms.platform.pojo;
2	2
	3	+import org.apache.commons.lang.StringUtils;
3	4	import org.springframework.data.mongodb.core.mapping.Document;
4	5
5	6	import java.util.Date;
...	...	@@ -41,7 +42,11 @@
41	42	}
42	43
43	44	public void setHospitalId(String hospitalId) {
44		- this.hospitalId = hospitalId;
	45	+ if (StringUtils.isBlank(hospitalId)) {
	46	+ this.hospitalId = hospitalId;
	47	+ } else {
	48	+ this.hospitalId = null;
	49	+ }
45	50	}
46	51
47	52	private List<LisReportItem> itemList;
...	...	@@ -67,7 +72,11 @@
67	72	}
68	73
69	74	public void setPatientFid(String patientFid) {
70		- this.patientFid = patientFid;
	75	+ if (StringUtils.isBlank(patientFid)) {
	76	+ this.patientFid = hospitalId;
	77	+ } else {
	78	+ this.patientFid = null;
	79	+ }
71	80	}
72	81
73	82	public String getPatientHid() {
...	...	@@ -75,7 +84,11 @@
75	84	}
76	85
77	86	public void setPatientHid(String patientHid) {
78		- this.patientHid = patientHid;
	87	+ if (StringUtils.isBlank(patientHid)) {
	88	+ this.patientHid = patientHid;
	89	+ } else {
	90	+ this.patientHid = null;
	91	+ }
79	92	}
80	93
81	94	public String getVcCardNo() {
...	...	@@ -83,7 +96,11 @@
83	96	}
84	97
85	98	public void setVcCardNo(String vcCardNo) {
86		- this.vcCardNo = vcCardNo;
	99	+ if (StringUtils.isBlank(vcCardNo)) {
	100	+ this.vcCardNo = vcCardNo;
	101	+ } else {
	102	+ this.vcCardNo = null;
	103	+ }
87	104	}
88	105
89	106	public String getName() {
...	...	@@ -91,7 +108,11 @@
91	108	}
92	109
93	110	public void setName(String name) {
94		- this.name = name;
	111	+ if (StringUtils.isBlank(name)) {
	112	+ this.name = name;
	113	+ } else {
	114	+ this.name = null;
	115	+ }
95	116	}
96	117
97	118	public String getSex() {
...	...	@@ -99,7 +120,11 @@
99	120	}
100	121
101	122	public void setSex(String sex) {
102		- this.sex = sex;
	123	+ if (StringUtils.isBlank(sex)) {
	124	+ this.sex = sex;
	125	+ } else {
	126	+ this.sex = null;
	127	+ }
103	128	}
104	129
105	130	public Integer getAge() {
...	...	@@ -115,7 +140,11 @@
115	140	}
116	141
117	142	public void setDeptCode(String deptCode) {
118		- this.deptCode = deptCode;
	143	+ if (StringUtils.isBlank(deptCode)) {
	144	+ this.deptCode = deptCode;
	145	+ } else {
	146	+ this.deptCode = null;
	147	+ }
119	148	}
120	149
121	150	public String getDeptName() {
...	...	@@ -123,7 +152,11 @@
123	152	}
124	153
125	154	public void setDeptName(String deptName) {
126		- this.deptName = deptName;
	155	+ if (StringUtils.isBlank(deptName)) {
	156	+ this.deptName = deptName;
	157	+ } else {
	158	+ this.deptName = null;
	159	+ }
127	160	}
128	161
129	162	public String getApplyDoctorCode() {
...	...	@@ -131,7 +164,11 @@
131	164	}
132	165
133	166	public void setApplyDoctorCode(String applyDoctorCode) {
134		- this.applyDoctorCode = applyDoctorCode;
	167	+ if (StringUtils.isBlank(applyDoctorCode)) {
	168	+ this.applyDoctorCode = applyDoctorCode;
	169	+ } else {
	170	+ this.applyDoctorCode = null;
	171	+ }
135	172	}
136	173
137	174	public String getApplyDoctorName() {
...	...	@@ -139,7 +176,11 @@
139	176	}
140	177
141	178	public void setApplyDoctorName(String applyDoctorName) {
142		- this.applyDoctorName = applyDoctorName;
	179	+ if (StringUtils.isBlank(applyDoctorName)) {
	180	+ this.applyDoctorName = applyDoctorName;
	181	+ } else {
	182	+ this.applyDoctorName = null;
	183	+ }
143	184	}
144	185
145	186	public String getCheckDoctorCode() {
...	...	@@ -147,7 +188,11 @@
147	188	}
148	189
149	190	public void setCheckDoctorCode(String checkDoctorCode) {
150		- this.checkDoctorCode = checkDoctorCode;
	191	+ if (StringUtils.isBlank(checkDoctorCode)) {
	192	+ this.checkDoctorCode = checkDoctorCode;
	193	+ } else {
	194	+ this.checkDoctorCode = null;
	195	+ }
151	196	}
152	197
153	198	public String getCheckDoctorName() {
...	...	@@ -155,7 +200,11 @@
155	200	}
156	201
157	202	public void setCheckDoctorName(String checkDoctorName) {
158		- this.checkDoctorName = checkDoctorName;
	203	+ if (StringUtils.isBlank(checkDoctorName)) {
	204	+ this.checkDoctorName = checkDoctorName;
	205	+ } else {
	206	+ this.checkDoctorName = null;
	207	+ }
159	208	}
160	209
161	210	public Date getPublishTime() {

1	1	package com.lyms.platform.pojo;
2	2
	3	+import org.apache.commons.lang.StringUtils;
	4	+
3	5	/**
4	6	* Created by Administrator on 2016/10/19 0019.
5	7	*/
...	...	@@ -21,7 +23,11 @@
21	23	}
22	24
23	25	public void setId(String id) {
24		- this.id = id;
	26	+ if (StringUtils.isBlank(id)) {
	27	+ this.id = id;
	28	+ } else {
	29	+ this.id = null;
	30	+ }
25	31	}
26	32
27	33	public String getCode() {
...	...	@@ -29,7 +35,11 @@
29	35	}
30	36
31	37	public void setCode(String code) {
32		- this.code = code;
	38	+ if (StringUtils.isBlank(code)) {
	39	+ this.code = code;
	40	+ } else {
	41	+ this.code = null;
	42	+ }
33	43	}
34	44
35	45	public String getName() {
...	...	@@ -37,7 +47,11 @@
37	47	}
38	48
39	49	public void setName(String name) {
40		- this.name = name;
	50	+ if (StringUtils.isBlank(name)) {
	51	+ this.name = name;
	52	+ } else {
	53	+ this.name = null;
	54	+ }
41	55	}
42	56
43	57	public String getResult() {
...	...	@@ -45,7 +59,11 @@
45	59	}
46	60
47	61	public void setResult(String result) {
48		- this.result = result;
	62	+ if (StringUtils.isBlank(result)) {
	63	+ this.result = result;
	64	+ } else {
	65	+ this.result = null;
	66	+ }
49	67	}
50	68
51	69	public String getCharResult() {
...	...	@@ -53,7 +71,11 @@
53	71	}
54	72
55	73	public void setCharResult(String charResult) {
56		- this.charResult = charResult;
	74	+ if (StringUtils.isBlank(charResult)) {
	75	+ this.charResult = charResult;
	76	+ } else {
	77	+ this.charResult = null;
	78	+ }
57	79	}
58	80
59	81	public String getNumberResult() {
...	...	@@ -61,7 +83,11 @@
61	83	}
62	84
63	85	public void setNumberResult(String numberResult) {
64		- this.numberResult = numberResult;
	86	+ if (StringUtils.isBlank(numberResult)) {
	87	+ this.numberResult = numberResult;
	88	+ } else {
	89	+ this.numberResult = null;
	90	+ }
65	91	}
66	92
67	93	public String getFlag() {
...	...	@@ -69,7 +95,11 @@
69	95	}
70	96
71	97	public void setFlag(String flag) {
72		- this.flag = flag;
	98	+ if (StringUtils.isBlank(flag)) {
	99	+ this.flag = flag;
	100	+ } else {
	101	+ this.flag = null;
	102	+ }
73	103	}
74	104
75	105	public String getRef() {
...	...	@@ -77,7 +107,11 @@
77	107	}
78	108
79	109	public void setRef(String ref) {
80		- this.ref = ref;
	110	+ if (StringUtils.isBlank(ref)) {
	111	+ this.ref = ref;
	112	+ } else {
	113	+ this.ref = null;
	114	+ }
81	115	}
82	116
83	117	public String getUnit() {
...	...	@@ -85,7 +119,11 @@
85	119	}
86	120
87	121	public void setUnit(String unit) {
88		- this.unit = unit;
	122	+ if (StringUtils.isBlank(unit)) {
	123	+ this.unit = unit;
	124	+ } else {
	125	+ this.unit = null;
	126	+ }
89	127	}
90	128
91	129	public String getResultType() {
...	...	@@ -93,7 +131,11 @@
93	131	}
94	132
95	133	public void setResultType(String resultType) {
96		- this.resultType = resultType;
	134	+ if (StringUtils.isBlank(resultType)) {
	135	+ this.resultType = resultType;
	136	+ } else {
	137	+ this.resultType = null;
	138	+ }
97	139	}
98	140	}

1	1	package com.lyms.hospitalapi.qhdfy;
2	2
3		-import com.lyms.hospitalapi.pojo.CheckResponse;
4		-import com.lyms.hospitalapi.pojo.RisCheckInfo;
5		-import com.lyms.hospitalapi.v1.*;
6	3	import com.lyms.platform.biz.service.LisReportService;
7	4	import com.lyms.platform.biz.service.PatientsService;
8		-import com.lyms.platform.common.utils.DateUtil;
9	5	import com.lyms.platform.pojo.LisReport;
10	6	import com.lyms.platform.pojo.LisReportItem;
11	7	import com.lyms.platform.query.LisReportQuery;
...	...	@@ -13,7 +9,6 @@
13	9	import org.apache.commons.dbutils.DbUtils;
14	10	import org.apache.commons.dbutils.QueryRunner;
15	11	import org.apache.commons.dbutils.handlers.BeanListHandler;
16		-import org.apache.commons.lang.StringUtils;
17	12	import org.joda.time.DateTime;
18	13	import org.springframework.beans.factory.annotation.Autowired;
19	14	import org.springframework.stereotype.Service;