Commit 3a3214e02e0cc190596deca396a7b228eafb864f
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 8 changed files
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
- platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckItemResponse.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.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
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
3a3214e
... | ... | @@ -389,16 +389,17 @@ |
389 | 389 | mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); |
390 | 390 | |
391 | 391 | try { |
392 | - List<String> list = FileUtils.readLines(new File("F:\\temp\\touwei.txt"),"gbk"); | |
392 | + List<String> list = FileUtils.readLines(new File("F:\\temp\\shenggaobietiz.txt"),"gbk"); | |
393 | 393 | for (String line:list) { |
394 | 394 | if (line != null) { |
395 | 395 | |
396 | 396 | String[] array = line.split(","); |
397 | 397 | |
398 | 398 | AwModel awModel2 = new AwModel(); |
399 | - awModel2.setType(2); | |
400 | - awModel2.setSex(0); | |
401 | - awModel2.setAge(Integer.valueOf(array[0])); | |
399 | + awModel2.setType(3); | |
400 | + awModel2.setSex(1); | |
401 | + awModel2.setAgeType(1); | |
402 | + awModel2.setHeight(Double.valueOf(array[0])); | |
402 | 403 | awModel2.setRthreeDs(Double.valueOf(array[1])); |
403 | 404 | awModel2.setRtwoDs(Double.valueOf(array[2])); |
404 | 405 | awModel2.setRoneDs(Double.valueOf(array[3])); |
platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java
View file @
3a3214e
... | ... | @@ -18,8 +18,29 @@ |
18 | 18 | private Double poneDs; |
19 | 19 | private Double ptwoDs; |
20 | 20 | private Double pthreeDs; |
21 | - //0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 | |
21 | + //0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 3身高别体重 | |
22 | 22 | private Integer type; |
23 | + | |
24 | + private Double height; | |
25 | + | |
26 | + //0 0-2岁 1 2-5岁 | |
27 | + private Integer ageType; | |
28 | + | |
29 | + public Double getHeight() { | |
30 | + return height; | |
31 | + } | |
32 | + | |
33 | + public void setHeight(Double height) { | |
34 | + this.height = height; | |
35 | + } | |
36 | + | |
37 | + public Integer getAgeType() { | |
38 | + return ageType; | |
39 | + } | |
40 | + | |
41 | + public void setAgeType(Integer ageType) { | |
42 | + this.ageType = ageType; | |
43 | + } | |
23 | 44 | |
24 | 45 | public Integer getType() { |
25 | 46 | return type; |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckItemResponse.java
View file @
3a3214e
1 | +package com.lyms.hospitalapi.pojo; | |
2 | + | |
3 | +/** | |
4 | + * Created by Administrator on 2016/9/9 0009. | |
5 | + */ | |
6 | +public class CheckItemResponse { | |
7 | + | |
8 | + private String name; | |
9 | + private String code; | |
10 | + private String result; | |
11 | + private String refer; | |
12 | + private String unit; | |
13 | + private String special; | |
14 | + | |
15 | + public String getName() { | |
16 | + return name; | |
17 | + } | |
18 | + | |
19 | + public void setName(String name) { | |
20 | + this.name = name; | |
21 | + } | |
22 | + | |
23 | + public String getCode() { | |
24 | + return code; | |
25 | + } | |
26 | + | |
27 | + public void setCode(String code) { | |
28 | + this.code = code; | |
29 | + } | |
30 | + | |
31 | + public String getResult() { | |
32 | + return result; | |
33 | + } | |
34 | + | |
35 | + public void setResult(String result) { | |
36 | + this.result = result; | |
37 | + } | |
38 | + | |
39 | + public String getRefer() { | |
40 | + return refer; | |
41 | + } | |
42 | + | |
43 | + public void setRefer(String refer) { | |
44 | + this.refer = refer; | |
45 | + } | |
46 | + | |
47 | + public String getUnit() { | |
48 | + return unit; | |
49 | + } | |
50 | + | |
51 | + public void setUnit(String unit) { | |
52 | + this.unit = unit; | |
53 | + } | |
54 | + | |
55 | + public String getSpecial() { | |
56 | + return special; | |
57 | + } | |
58 | + | |
59 | + public void setSpecial(String special) { | |
60 | + this.special = special; | |
61 | + } | |
62 | +} |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
View file @
3a3214e
1 | +package com.lyms.hospitalapi.pojo; | |
2 | + | |
3 | +import java.util.Date; | |
4 | +import java.util.List; | |
5 | + | |
6 | +/** | |
7 | + * Created by Administrator on 2016/9/9 0009. | |
8 | + */ | |
9 | +public class CheckResponse { | |
10 | + | |
11 | + private Date applyDate; | |
12 | + private String applyDateStr; | |
13 | + private String sex; | |
14 | + private String name; | |
15 | + private String age; | |
16 | + private String applyDept; | |
17 | + private String doctor; | |
18 | + private String checkDept; | |
19 | + private String imgs; | |
20 | + private String result; | |
21 | + private String notice; | |
22 | + /* 1:检验报告,2:影像报告 */ | |
23 | + private Integer type; | |
24 | + private String title; | |
25 | + private Date modified; | |
26 | + | |
27 | + public Date getModified() { | |
28 | + return modified; | |
29 | + } | |
30 | + | |
31 | + public void setModified(Date modified) { | |
32 | + this.modified = modified; | |
33 | + } | |
34 | + | |
35 | + public String getTitle() { | |
36 | + return title; | |
37 | + } | |
38 | + | |
39 | + public void setTitle(String title) { | |
40 | + this.title = title; | |
41 | + } | |
42 | + | |
43 | + private List<CheckItemResponse> itemList; | |
44 | + | |
45 | + public Integer getType() { | |
46 | + return type; | |
47 | + } | |
48 | + | |
49 | + public void setType(Integer type) { | |
50 | + this.type = type; | |
51 | + } | |
52 | + | |
53 | + public Date getApplyDate() { | |
54 | + return applyDate; | |
55 | + } | |
56 | + | |
57 | + public void setApplyDate(Date applyDate) { | |
58 | + this.applyDate = applyDate; | |
59 | + } | |
60 | + | |
61 | + public String getApplyDateStr() { | |
62 | + return applyDateStr; | |
63 | + } | |
64 | + | |
65 | + public void setApplyDateStr(String applyDateStr) { | |
66 | + this.applyDateStr = applyDateStr; | |
67 | + } | |
68 | + | |
69 | + public String getSex() { | |
70 | + return sex; | |
71 | + } | |
72 | + | |
73 | + public void setSex(String sex) { | |
74 | + this.sex = sex; | |
75 | + } | |
76 | + | |
77 | + public String getName() { | |
78 | + return name; | |
79 | + } | |
80 | + | |
81 | + public void setName(String name) { | |
82 | + this.name = name; | |
83 | + } | |
84 | + | |
85 | + public String getAge() { | |
86 | + return age; | |
87 | + } | |
88 | + | |
89 | + public void setAge(String age) { | |
90 | + this.age = age; | |
91 | + } | |
92 | + | |
93 | + public String getApplyDept() { | |
94 | + return applyDept; | |
95 | + } | |
96 | + | |
97 | + public void setApplyDept(String applyDept) { | |
98 | + this.applyDept = applyDept; | |
99 | + } | |
100 | + | |
101 | + public String getDoctor() { | |
102 | + return doctor; | |
103 | + } | |
104 | + | |
105 | + public void setDoctor(String doctor) { | |
106 | + this.doctor = doctor; | |
107 | + } | |
108 | + | |
109 | + public String getCheckDept() { | |
110 | + return checkDept; | |
111 | + } | |
112 | + | |
113 | + public void setCheckDept(String checkDept) { | |
114 | + this.checkDept = checkDept; | |
115 | + } | |
116 | + | |
117 | + public String getImgs() { | |
118 | + return imgs; | |
119 | + } | |
120 | + | |
121 | + public void setImgs(String imgs) { | |
122 | + this.imgs = imgs; | |
123 | + } | |
124 | + | |
125 | + public String getResult() { | |
126 | + return result; | |
127 | + } | |
128 | + | |
129 | + public void setResult(String result) { | |
130 | + this.result = result; | |
131 | + } | |
132 | + | |
133 | + public String getNotice() { | |
134 | + return notice; | |
135 | + } | |
136 | + | |
137 | + public void setNotice(String notice) { | |
138 | + this.notice = notice; | |
139 | + } | |
140 | + | |
141 | + public List<CheckItemResponse> getItemList() { | |
142 | + return itemList; | |
143 | + } | |
144 | + | |
145 | + public void setItemList(List<CheckItemResponse> itemList) { | |
146 | + this.itemList = itemList; | |
147 | + } | |
148 | +} |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java
View file @
3a3214e
... | ... | @@ -26,6 +26,7 @@ |
26 | 26 | public class LisCheckInfo { |
27 | 27 | |
28 | 28 | private String P_APPLICATIONNUM; |
29 | + private String P_TITLE; | |
29 | 30 | private String P_CARD; |
30 | 31 | private String P_BEDNUN; |
31 | 32 | private String P_CHECKDEPARTNAME; |
... | ... | @@ -42,6 +43,14 @@ |
42 | 43 | private Date P_CHECKTIME; |
43 | 44 | private Date MODIFIED; |
44 | 45 | private Integer STATUS; |
46 | + | |
47 | + public String getP_TITLE() { | |
48 | + return P_TITLE; | |
49 | + } | |
50 | + | |
51 | + public void setP_TITLE(String p_TITLE) { | |
52 | + P_TITLE = p_TITLE; | |
53 | + } | |
45 | 54 | |
46 | 55 | public String getP_APPLICATIONNUM() { |
47 | 56 | return P_APPLICATIONNUM; |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java
View file @
3a3214e
1 | +package com.lyms.hospitalapi.pojo; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * Created by Administrator on 2016/9/9 0009. | |
7 | + * SICK_KIND VARCHAR2 患者类别," 儿童"或者"孕妇" | |
8 | + CARDNO VARCHAR2 卡号 | |
9 | + APPLY_NO VARCHAR2 申请单号 | |
10 | + SICK_ID VARCHAR2 病人唯一ID | |
11 | + RESIDENCE_NO VARCHAR2 住院号 | |
12 | + NAME VARCHAR2 患者姓名 | |
13 | + SEX VARCHAR2 性别 | |
14 | + AGE Number 年龄 | |
15 | + APPLY_DEPT VARCHAR2 申请科室名称 | |
16 | + IN_DEPT VARCHAR2 病区代码 | |
17 | + BED_NO VARCHAR2 床号 | |
18 | + APPLY_DOCTOR VARCHAR2 申请医生 | |
19 | + EXECUTE_DEPT VARCHAR2 执行科室名称 | |
20 | + EXECUTE_MAN VARCHAR2 执行人 | |
21 | + APPLY_TIME Date 申请时间(检查时间) | |
22 | + STATUS NUMBER 1:申请中,2:检查中,3:诊断完成 | |
23 | + MODIFIED DATE 最后修改时间 | |
24 | + ITEM_RESULT,ITEM_FINDING,IMGS,P_TITLE | |
25 | + */ | |
26 | +public class RisCheckInfo { | |
27 | + | |
28 | + private String SICK_KIND; | |
29 | + private String CARDNO; | |
30 | + private String APPLY_NO; | |
31 | + private String SICK_ID; | |
32 | + private String RESIDENCE_NO; | |
33 | + private String NAME; | |
34 | + private String SEX; | |
35 | + private String APPLY_DEPT; | |
36 | + private String IN_DEPT; | |
37 | + private String BED_NO; | |
38 | + private String APPLY_DOCTOR; | |
39 | + private String EXECUTE_DEPT; | |
40 | + private String EXECUTE_MAN; | |
41 | + private Integer AGE; | |
42 | + private Integer STATUS; | |
43 | + private Date APPLY_TIME; | |
44 | + private Date MODIFIED; | |
45 | + private String ITEM_RESULT; | |
46 | + private String ITEM_FINDING; | |
47 | + private String IMGS; | |
48 | + private String P_TITLE; | |
49 | + | |
50 | + public String getSICK_KIND() { | |
51 | + return SICK_KIND; | |
52 | + } | |
53 | + | |
54 | + public void setSICK_KIND(String SICK_KIND) { | |
55 | + this.SICK_KIND = SICK_KIND; | |
56 | + } | |
57 | + | |
58 | + public String getCARDNO() { | |
59 | + return CARDNO; | |
60 | + } | |
61 | + | |
62 | + public void setCARDNO(String CARDNO) { | |
63 | + this.CARDNO = CARDNO; | |
64 | + } | |
65 | + | |
66 | + public String getAPPLY_NO() { | |
67 | + return APPLY_NO; | |
68 | + } | |
69 | + | |
70 | + public void setAPPLY_NO(String APPLY_NO) { | |
71 | + this.APPLY_NO = APPLY_NO; | |
72 | + } | |
73 | + | |
74 | + public String getSICK_ID() { | |
75 | + return SICK_ID; | |
76 | + } | |
77 | + | |
78 | + public void setSICK_ID(String SICK_ID) { | |
79 | + this.SICK_ID = SICK_ID; | |
80 | + } | |
81 | + | |
82 | + public String getRESIDENCE_NO() { | |
83 | + return RESIDENCE_NO; | |
84 | + } | |
85 | + | |
86 | + public void setRESIDENCE_NO(String RESIDENCE_NO) { | |
87 | + this.RESIDENCE_NO = RESIDENCE_NO; | |
88 | + } | |
89 | + | |
90 | + public String getNAME() { | |
91 | + return NAME; | |
92 | + } | |
93 | + | |
94 | + public void setNAME(String NAME) { | |
95 | + this.NAME = NAME; | |
96 | + } | |
97 | + | |
98 | + public String getSEX() { | |
99 | + return SEX; | |
100 | + } | |
101 | + | |
102 | + public void setSEX(String SEX) { | |
103 | + this.SEX = SEX; | |
104 | + } | |
105 | + | |
106 | + public String getAPPLY_DEPT() { | |
107 | + return APPLY_DEPT; | |
108 | + } | |
109 | + | |
110 | + public void setAPPLY_DEPT(String APPLY_DEPT) { | |
111 | + this.APPLY_DEPT = APPLY_DEPT; | |
112 | + } | |
113 | + | |
114 | + public String getIN_DEPT() { | |
115 | + return IN_DEPT; | |
116 | + } | |
117 | + | |
118 | + public void setIN_DEPT(String IN_DEPT) { | |
119 | + this.IN_DEPT = IN_DEPT; | |
120 | + } | |
121 | + | |
122 | + public String getBED_NO() { | |
123 | + return BED_NO; | |
124 | + } | |
125 | + | |
126 | + public void setBED_NO(String BED_NO) { | |
127 | + this.BED_NO = BED_NO; | |
128 | + } | |
129 | + | |
130 | + public String getAPPLY_DOCTOR() { | |
131 | + return APPLY_DOCTOR; | |
132 | + } | |
133 | + | |
134 | + public void setAPPLY_DOCTOR(String APPLY_DOCTOR) { | |
135 | + this.APPLY_DOCTOR = APPLY_DOCTOR; | |
136 | + } | |
137 | + | |
138 | + public String getEXECUTE_DEPT() { | |
139 | + return EXECUTE_DEPT; | |
140 | + } | |
141 | + | |
142 | + public void setEXECUTE_DEPT(String EXECUTE_DEPT) { | |
143 | + this.EXECUTE_DEPT = EXECUTE_DEPT; | |
144 | + } | |
145 | + | |
146 | + public String getEXECUTE_MAN() { | |
147 | + return EXECUTE_MAN; | |
148 | + } | |
149 | + | |
150 | + public void setEXECUTE_MAN(String EXECUTE_MAN) { | |
151 | + this.EXECUTE_MAN = EXECUTE_MAN; | |
152 | + } | |
153 | + | |
154 | + public Integer getAGE() { | |
155 | + return AGE; | |
156 | + } | |
157 | + | |
158 | + public void setAGE(Integer AGE) { | |
159 | + this.AGE = AGE; | |
160 | + } | |
161 | + | |
162 | + public Integer getSTATUS() { | |
163 | + return STATUS; | |
164 | + } | |
165 | + | |
166 | + public void setSTATUS(Integer STATUS) { | |
167 | + this.STATUS = STATUS; | |
168 | + } | |
169 | + | |
170 | + public Date getAPPLY_TIME() { | |
171 | + return APPLY_TIME; | |
172 | + } | |
173 | + | |
174 | + public void setAPPLY_TIME(Date APPLY_TIME) { | |
175 | + this.APPLY_TIME = APPLY_TIME; | |
176 | + } | |
177 | + | |
178 | + public Date getMODIFIED() { | |
179 | + return MODIFIED; | |
180 | + } | |
181 | + | |
182 | + public void setMODIFIED(Date MODIFIED) { | |
183 | + this.MODIFIED = MODIFIED; | |
184 | + } | |
185 | + | |
186 | + public String getITEM_RESULT() { | |
187 | + return ITEM_RESULT; | |
188 | + } | |
189 | + | |
190 | + public void setITEM_RESULT(String ITEM_RESULT) { | |
191 | + this.ITEM_RESULT = ITEM_RESULT; | |
192 | + } | |
193 | + | |
194 | + public String getITEM_FINDING() { | |
195 | + return ITEM_FINDING; | |
196 | + } | |
197 | + | |
198 | + public void setITEM_FINDING(String ITEM_FINDING) { | |
199 | + this.ITEM_FINDING = ITEM_FINDING; | |
200 | + } | |
201 | + | |
202 | + public String getIMGS() { | |
203 | + return IMGS; | |
204 | + } | |
205 | + | |
206 | + public void setIMGS(String IMGS) { | |
207 | + this.IMGS = IMGS; | |
208 | + } | |
209 | + | |
210 | + public String getP_TITLE() { | |
211 | + return P_TITLE; | |
212 | + } | |
213 | + | |
214 | + public void setP_TITLE(String p_TITLE) { | |
215 | + P_TITLE = p_TITLE; | |
216 | + } | |
217 | +} |
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
View file @
3a3214e
1 | 1 | package com.lyms.hospitalapi.v1; |
2 | 2 | |
3 | -import com.lyms.hospitalapi.pojo.LisCheckInfo; | |
4 | -import com.lyms.hospitalapi.pojo.LisCheckResult; | |
3 | +import com.lyms.hospitalapi.pojo.*; | |
5 | 4 | import com.lyms.hospitalapi.v2.*; |
6 | 5 | import com.lyms.platform.common.utils.DateUtil; |
7 | 6 | import org.apache.commons.dbutils.DbUtils; |
... | ... | @@ -12,7 +11,7 @@ |
12 | 11 | |
13 | 12 | import java.sql.Connection; |
14 | 13 | import java.sql.SQLException; |
15 | -import java.util.List; | |
14 | +import java.util.*; | |
16 | 15 | |
17 | 16 | /** |
18 | 17 | * Created by Administrator on 2016/9/9 0009. |
19 | 18 | |
... | ... | @@ -20,9 +19,37 @@ |
20 | 19 | @Service("hisServiceV1") |
21 | 20 | public class HisService { |
22 | 21 | |
23 | - public void queryLisCheckList(String cardNo) { | |
22 | + public List<CheckResponse> queryCheckList(String cardNo) { | |
23 | + List<CheckResponse> result = new ArrayList<>(); | |
24 | + result.addAll(queryLisCheckList(cardNo)); | |
25 | + result.addAll(queryPacsCheckList(cardNo)); | |
26 | + // 去重 | |
27 | + List<CheckResponse> list = new ArrayList<>(); | |
28 | + Date tempDate = null; | |
29 | + for (CheckResponse check:result) { | |
30 | + if (check.getModified().equals(tempDate)) { | |
31 | + continue; | |
32 | + } | |
33 | + list.add(check); | |
34 | + tempDate = check.getModified(); | |
35 | + } | |
36 | + | |
37 | + // 排序 | |
38 | + Collections.sort(list, new Comparator() { | |
39 | + public int compare(Object a, Object b) { | |
40 | + if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { | |
41 | + return 1; | |
42 | + } | |
43 | + return 0; | |
44 | + } | |
45 | + }); | |
46 | + return list; | |
47 | + } | |
48 | + | |
49 | + public List<CheckResponse> queryLisCheckList(String cardNo) { | |
50 | + List<CheckResponse> result = new ArrayList<>(); | |
24 | 51 | if (StringUtils.isNotBlank(cardNo)) { |
25 | - Connection conn = com.lyms.hospitalapi.v2.ConnTools.makeHisConnection(); | |
52 | + Connection conn = ConnTools.makeLisConnection(); | |
26 | 53 | QueryRunner queryRunner = new QueryRunner(); |
27 | 54 | try { |
28 | 55 | List<LisCheckInfo> list = queryRunner.query(conn, "select * from lis_check_info where P_CARD = '"+cardNo+"'", new BeanListHandler<LisCheckInfo>(LisCheckInfo.class)); |
29 | 56 | |
30 | 57 | |
31 | 58 | |
32 | 59 | |
33 | 60 | |
... | ... | @@ -31,17 +58,92 @@ |
31 | 58 | if (StringUtils.isNotBlank(info.getP_APPLICATIONNUM())) { |
32 | 59 | List<LisCheckResult> resultList = queryRunner.query(conn, "select * from lis_check_result where P_APPLICATIONNUM = '"+info.getP_APPLICATIONNUM()+"'", new BeanListHandler<LisCheckResult>(LisCheckResult.class)); |
33 | 60 | if (resultList != null && resultList.size() > 0) { |
61 | + CheckResponse check = new CheckResponse(); | |
62 | + check.setModified(info.getMODIFIED()); | |
63 | + check.setType(1); | |
64 | + check.setName(info.getP_NAME()); | |
65 | + check.setTitle(info.getP_TITLE()); | |
66 | + check.setAge(info.getP_AGE()); | |
67 | + check.setApplyDate(info.getP_CHECKTIME()); | |
68 | + check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getP_CHECKTIME())); | |
69 | + check.setCheckDept(info.getP_CHECKDEPARTNAME()); | |
70 | + check.setDoctor(info.getP_APPLATIONDOCNAME()); | |
71 | + if ("1".equals(info.getP_SEX())) { | |
72 | + check.setSex("男"); | |
73 | + } else if ("0".equals(info.getP_SEX())) { | |
74 | + check.setSex("女"); | |
75 | + } | |
76 | + List<CheckItemResponse> itemList = new ArrayList<>(); | |
77 | + check.setItemList(itemList); | |
78 | + for (LisCheckResult checkItem:resultList) { | |
79 | + CheckItemResponse item = new CheckItemResponse(); | |
80 | + item.setName(checkItem.getP_ITEMNAME()); | |
81 | + item.setCode(checkItem.getP_ITEMCODE()); | |
82 | + item.setRefer(checkItem.getP_REFERENCEVALUE()); | |
83 | + item.setResult(checkItem.getP_ITEMRESULT()); | |
84 | + item.setUnit(checkItem.getP_UNIT()); | |
85 | + item.setSpecial(checkItem.getP_HIGHANDLOWMARK()); | |
86 | + itemList.add(item); | |
87 | + } | |
88 | + result.add(check); | |
89 | + } | |
90 | + } | |
91 | + } | |
92 | + } | |
93 | + DbUtils.closeQuietly(conn); | |
94 | + return result; | |
95 | + } catch (SQLException e) { | |
96 | + DbUtils.closeQuietly(conn); | |
97 | + e.printStackTrace(); | |
98 | + return result; | |
99 | + } | |
100 | + } | |
101 | + return result; | |
102 | + } | |
34 | 103 | |
104 | + public List<CheckResponse> queryPacsCheckList(String cardNo) { | |
105 | + List<CheckResponse> result = new ArrayList<>(); | |
106 | + if (StringUtils.isNotBlank(cardNo)) { | |
107 | + Connection conn = ConnTools.makePacsConnection(); | |
108 | + QueryRunner queryRunner = new QueryRunner(); | |
109 | + try { | |
110 | + List<RisCheckInfo> list = queryRunner.query(conn, "select * from ris.ris_check_info where CARDNO = '"+cardNo+"' order by apply_time", new BeanListHandler<RisCheckInfo>(RisCheckInfo.class)); | |
111 | + if (list.size() > 0) { | |
112 | + for (RisCheckInfo info:list) { | |
113 | + if (StringUtils.isNotBlank(info.getITEM_RESULT())) { | |
114 | + CheckResponse check = new CheckResponse(); | |
115 | + check.setModified(info.getMODIFIED()); | |
116 | + check.setType(2); | |
117 | + check.setName(info.getNAME()); | |
118 | + if (info.getAGE() != null) { | |
119 | + check.setAge(info.getAGE().toString()); | |
35 | 120 | } |
121 | + check.setApplyDate(info.getAPPLY_TIME()); | |
122 | + check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getAPPLY_TIME())); | |
123 | + check.setCheckDept(info.getAPPLY_DEPT()); | |
124 | + check.setDoctor(info.getEXECUTE_MAN()); | |
125 | + if ("F".equals(info.getSEX())) { | |
126 | + check.setSex("女"); | |
127 | + } else { | |
128 | + check.setSex("男"); | |
129 | + } | |
130 | + check.setResult(info.getITEM_RESULT()); | |
131 | + check.setNotice(info.getITEM_FINDING()); | |
132 | + check.setTitle(info.getP_TITLE()); | |
133 | + check.setImgs(info.getIMGS()); | |
134 | + result.add(check); | |
36 | 135 | } |
37 | 136 | } |
38 | 137 | } |
39 | 138 | DbUtils.closeQuietly(conn); |
139 | + return result; | |
40 | 140 | } catch (SQLException e) { |
41 | 141 | DbUtils.closeQuietly(conn); |
42 | 142 | e.printStackTrace(); |
143 | + return result; | |
43 | 144 | } |
44 | 145 | } |
146 | + return result; | |
45 | 147 | } |
46 | 148 | |
47 | 149 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
3a3214e
1 | 1 | package com.lyms.platform.operate.web.controller; |
2 | 2 | |
3 | +import com.lyms.hospitalapi.v1.HisService; | |
3 | 4 | import com.lyms.platform.common.annotation.TokenRequired; |
4 | 5 | import com.lyms.platform.common.base.BaseController; |
5 | 6 | import com.lyms.platform.common.base.LoginContext; |
6 | 7 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
8 | +import com.lyms.platform.common.result.BaseListResponse; | |
9 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
7 | 10 | import com.lyms.platform.common.result.BaseResponse; |
8 | 11 | import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; |
9 | 12 | import com.lyms.platform.operate.web.request.*; |
... | ... | @@ -28,6 +31,19 @@ |
28 | 31 | @Autowired |
29 | 32 | private AntenatalExaminationFacade antenatalExaminationFacade; |
30 | 33 | |
34 | + @Autowired | |
35 | + private HisService hisServiceV1; | |
36 | + | |
37 | + /** | |
38 | + * | |
39 | + * @return | |
40 | + */ | |
41 | + @RequestMapping(method = RequestMethod.GET, value = "/hischecklist") | |
42 | + @ResponseBody | |
43 | + @TokenRequired | |
44 | + public BaseResponse queryHisCheckList(String cardNo, HttpServletRequest request) { | |
45 | + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckList(cardNo)); | |
46 | + } | |
31 | 47 | |
32 | 48 | /** |
33 | 49 | * 查询产前检查 |