Commit 2b10871c554ea50005aa04f7f09df3b8b9b4a065
1 parent
d05266b477
Exists in
master
and in
6 other branches
测量
Showing 1 changed file with 35 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
2b10871
| ... | ... | @@ -198,8 +198,17 @@ |
| 198 | 198 | public BaseObjectResponse getMeasureBaseInfo(String certType, String certNo, String hospitalId) { |
| 199 | 199 | MeasureBaseInfoResult result = new MeasureBaseInfoResult(); |
| 200 | 200 | MeasureUserInfoQuery query = new MeasureUserInfoQuery(); |
| 201 | - query.setCertType(certType); | |
| 202 | - query.setCertNo(certNo); | |
| 201 | + query.setHospitalId(hospitalId); | |
| 202 | + if ("1".equals(certType)) | |
| 203 | + { | |
| 204 | + query.setVcCardNo(certNo); | |
| 205 | + } | |
| 206 | + else | |
| 207 | + { | |
| 208 | + query.setCertType(certType); | |
| 209 | + query.setCertNo(certNo); | |
| 210 | + } | |
| 211 | + | |
| 203 | 212 | query.setNeed("true"); |
| 204 | 213 | query.setSort(" created desc "); |
| 205 | 214 | List<MeasureUserInfoModel> models = mysqlMeasureUserInfoService.queryMeasureUserInfoList(query); |
| ... | ... | @@ -224,8 +233,19 @@ |
| 224 | 233 | else |
| 225 | 234 | { |
| 226 | 235 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 227 | - patientsQuery.setPcerteTypeId(certType); | |
| 228 | - patientsQuery.setCardNo(certNo); | |
| 236 | + patientsQuery.setHospitalId(hospitalId); | |
| 237 | + | |
| 238 | + if ("1".equals(certType)) | |
| 239 | + { | |
| 240 | + patientsQuery.setVcCardNo(certNo); | |
| 241 | + } | |
| 242 | + else | |
| 243 | + { | |
| 244 | + patientsQuery.setPcerteTypeId(certType); | |
| 245 | + patientsQuery.setCardNo(certNo); | |
| 246 | + } | |
| 247 | + | |
| 248 | + | |
| 229 | 249 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 230 | 250 | if (CollectionUtils.isNotEmpty(patientsList)) |
| 231 | 251 | { |
| ... | ... | @@ -247,7 +267,7 @@ |
| 247 | 267 | } |
| 248 | 268 | else |
| 249 | 269 | { |
| 250 | - if ("216".equals(hospitalId)) | |
| 270 | + if ("216".equals(hospitalId) && !"1".equals(certType)) | |
| 251 | 271 | { |
| 252 | 272 | result = getPatientZyInfo(" and ZJH='"+certNo+"'",certType,hospitalId); |
| 253 | 273 | } |
| ... | ... | @@ -578,8 +598,16 @@ |
| 578 | 598 | public BaseObjectResponse getMeasurePatientInfo(String certType, String certNo, String hospitalId) { |
| 579 | 599 | MeasureBaseInfoResult result = new MeasureBaseInfoResult(); |
| 580 | 600 | MeasureUserInfoQuery query = new MeasureUserInfoQuery(); |
| 581 | - query.setCertType(certType); | |
| 582 | - query.setCertNo(certNo); | |
| 601 | + if ("1".equals(certType)) | |
| 602 | + { | |
| 603 | + query.setVcCardNo(certNo); | |
| 604 | + } | |
| 605 | + else | |
| 606 | + { | |
| 607 | + query.setCertType(certType); | |
| 608 | + query.setCertNo(certNo); | |
| 609 | + } | |
| 610 | + | |
| 583 | 611 | query.setHospitalId(hospitalId); |
| 584 | 612 | query.setNeed("true"); |
| 585 | 613 | query.setSort(" created desc "); |