Commit 6a830c0b7d91375d8d6aee9eddb72a8f6169b399
1 parent
ee4f2f912c
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 58 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
6a830c0
| ... | ... | @@ -2205,8 +2205,8 @@ |
| 2205 | 2205 | List list = listResponse.getData(); |
| 2206 | 2206 | for (Object obj : list) { |
| 2207 | 2207 | Map <String, Object> data = new HashMap <>(); |
| 2208 | - //孕妇 | |
| 2209 | - if(obj instanceof RiskPatientsResult){ | |
| 2208 | + //高危孕妇 | |
| 2209 | + if(patientsQueryRequest.getQueryType()==0){ | |
| 2210 | 2210 | RiskPatientsResult rp = (RiskPatientsResult) obj; |
| 2211 | 2211 | data.put("name", rp.getName()); |
| 2212 | 2212 | data.put("age", rp.getAge()); |
| 2213 | 2213 | |
| ... | ... | @@ -2228,8 +2228,35 @@ |
| 2228 | 2228 | data.put("serviceType", rp.getServiceType()); |
| 2229 | 2229 | data.put("serviceStatus", rp.getServiceStatus()); |
| 2230 | 2230 | datas.add(data); |
| 2231 | + }else if(patientsQueryRequest.getQueryType()==1){ | |
| 2232 | + //全部孕妇 | |
| 2233 | + QuanPatientsResult rp = (QuanPatientsResult) obj; | |
| 2234 | + data.put("name", rp.getName()); | |
| 2235 | + data.put("age", rp.getAge()); | |
| 2236 | + if ("1000000115".equals(hospital)) { | |
| 2237 | + data.put("cardNo", rp.getCardNo()); | |
| 2238 | + data.put("vcCardNo", rp.getVcCardNo()); | |
| 2239 | + } | |
| 2240 | + data.put("cardNo", rp.getCardNo()); | |
| 2241 | + data.put("dueWeek", rp.getDueWeek()); | |
| 2242 | + data.put("bTime", rp.getbTime()); | |
| 2243 | + data.put("cTimes", rp.getcTimes()); | |
| 2244 | + data.put("createdWeek", rp.getCreatedWeek()); | |
| 2245 | + data.put("dueDate", rp.getDueDate()); | |
| 2246 | + data.put("registerAddr", rp.getRegisterAddr()); | |
| 2247 | + data.put("addr", rp.getAddr()); | |
| 2248 | + data.put("cHTimes", rp.getcHTimes()); | |
| 2249 | + data.put("dueWeek", rp.getDueWeek()); | |
| 2250 | + data.put("cTime", rp.getcTime()); | |
| 2251 | + data.put("currentCh", rp.getCurrentCh()); | |
| 2252 | + data.put("checkDoctor", rp.getCheckDoctor()); | |
| 2253 | + data.put("lName", rp.getlName()); | |
| 2254 | + data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : com.lyms.platform.common.utils.StringUtils.encryPhone(rp.getRealPhone())); | |
| 2255 | + data.put("serviceType", rp.getServiceType()); | |
| 2256 | + data.put("serviceStatus", rp.getServiceStatus()); | |
| 2257 | + datas.add(data); | |
| 2231 | 2258 | }else { |
| 2232 | - //产妇 | |
| 2259 | + //全部产妇 | |
| 2233 | 2260 | QuanChanResult rp = (QuanChanResult) obj; |
| 2234 | 2261 | data.put("name", rp.getName()); |
| 2235 | 2262 | data.put("age", rp.getAge()); |
| ... | ... | @@ -2249,8 +2276,8 @@ |
| 2249 | 2276 | datas.add(data); |
| 2250 | 2277 | } |
| 2251 | 2278 | } |
| 2252 | - //孕妇 | |
| 2253 | - if(patientsQueryRequest.getQueryType()==0||patientsQueryRequest.getQueryType()==1){ | |
| 2279 | + //高危孕妇 | |
| 2280 | + if(patientsQueryRequest.getQueryType()==0){ | |
| 2254 | 2281 | cnames.put("name", "姓名"); |
| 2255 | 2282 | cnames.put("age", "当前年龄"); |
| 2256 | 2283 | if ("1000000115".equals(hospital)) { |
| 2257 | 2284 | |
| ... | ... | @@ -2270,8 +2297,32 @@ |
| 2270 | 2297 | cnames.put("phone", "联系方式"); |
| 2271 | 2298 | cnames.put("serviceType", "服务类型"); |
| 2272 | 2299 | cnames.put("serviceStatus", "服务状态"); |
| 2300 | + }else if(patientsQueryRequest.getQueryType()==1){ | |
| 2301 | + //全部孕妇 | |
| 2302 | + cnames.put("name", "姓名"); | |
| 2303 | + cnames.put("age", "当前年龄"); | |
| 2304 | + if ("1000000115".equals(hospital)) { | |
| 2305 | + cnames.put("cardNo", "身份证"); | |
| 2306 | + cnames.put("vcCardNo", "就诊卡号"); | |
| 2307 | + } | |
| 2308 | + cnames.put("cardNo", "身份证"); | |
| 2309 | + cnames.put("dueWeek", "当前孕周"); | |
| 2310 | + cnames.put("bTime", "建档日期"); | |
| 2311 | + cnames.put("cTimes", "产检次数"); | |
| 2312 | + cnames.put("createdWeek", "建档孕周"); | |
| 2313 | + cnames.put("dueDate", "预产期"); | |
| 2314 | + cnames.put("registerAddr", "户籍地址"); | |
| 2315 | + cnames.put("addr", "居住地址"); | |
| 2316 | + cnames.put("cHTimes", "本院产检次数"); | |
| 2317 | + cnames.put("cTime", "预约产检日期"); | |
| 2318 | + cnames.put("currentCh", "当前产检医院"); | |
| 2319 | + cnames.put("checkDoctor", "产检医生"); | |
| 2320 | + cnames.put("lName", "登记人"); | |
| 2321 | + cnames.put("phone", "联系方式"); | |
| 2322 | + cnames.put("serviceType", "服务类型"); | |
| 2323 | + cnames.put("serviceStatus", "服务状态"); | |
| 2273 | 2324 | }else { |
| 2274 | - //产妇 | |
| 2325 | + //全部产妇 | |
| 2275 | 2326 | cnames.put("name", "姓名"); |
| 2276 | 2327 | cnames.put("age", "分娩年龄"); |
| 2277 | 2328 | cnames.put("dueWeek", "分娩日期"); |