Commit 6a3e5d74f047714967c60b4b1df3ed854d1b0fb5
1 parent
fa51f372c2
Exists in
master
and in
6 other branches
儿童测量记录
Showing 2 changed files with 10 additions and 11 deletions
platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
View file @
6a3e5d7
| ... | ... | @@ -399,6 +399,9 @@ |
| 399 | 399 | <if test="todayCount != null and todayCount > 0"> |
| 400 | 400 | AND today_count = #{todayCount,jdbcType=INTEGER} |
| 401 | 401 | </if> |
| 402 | + <if test="hospitalId != null"> | |
| 403 | + AND hospital_id = #{hospitalId,jdbcType=VARCHAR} | |
| 404 | + </if> | |
| 402 | 405 | |
| 403 | 406 | <if test="babyIds != null and babyIds.size > 0"> |
| 404 | 407 | and baby_id in |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
6a3e5d7
| ... | ... | @@ -1413,17 +1413,13 @@ |
| 1413 | 1413 | } catch (Exception e) { |
| 1414 | 1414 | // 什么都不干 |
| 1415 | 1415 | } |
| 1416 | -// if ("1000000114".equals(patients.getHospitalId())) { | |
| 1417 | -// patientManagerQueryModel.setPhone(patients.getPhone()); | |
| 1418 | -// patientManagerQueryModel.setCardNo(patients.getCardNo()); | |
| 1419 | -// } else { | |
| 1420 | -// patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
| 1421 | -// patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
| 1422 | -// } | |
| 1423 | - | |
| 1424 | - patientManagerQueryModel.setPhone(patients.getPhone()); | |
| 1425 | - patientManagerQueryModel.setCardNo(patients.getCardNo()); | |
| 1426 | - | |
| 1416 | + if ("1000000114".equals(patients.getHospitalId())) { | |
| 1417 | + patientManagerQueryModel.setPhone(patients.getPhone()); | |
| 1418 | + patientManagerQueryModel.setCardNo(patients.getCardNo()); | |
| 1419 | + } else { | |
| 1420 | + patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
| 1421 | + patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
| 1422 | + } | |
| 1427 | 1423 | patientManagerQueryModel.setBuildWeek(dueWeek); |
| 1428 | 1424 | |
| 1429 | 1425 | String bookbuildingDoctor = ""; |