Commit 9e22fdcf3833c41cd25b62dc8af6f557b37b738b
1 parent
18ebba3266
Exists in
master
and in
3 other branches
区域档案管理
Showing 1 changed file with 5 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
View file @
9e22fdc
| ... | ... | @@ -93,14 +93,7 @@ |
| 93 | 93 | for (Patients patients : patientses) { |
| 94 | 94 | StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId()); |
| 95 | 95 | QuanChanResult chanResult = new QuanChanResult(); |
| 96 | - /*********************************************************/ | |
| 97 | - /** | |
| 98 | - * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表 | |
| 99 | - */ | |
| 100 | - if (patients.getFirstCheckTime() != null){ | |
| 101 | - chanResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime())); | |
| 102 | - } | |
| 103 | - /*********************************************************/ | |
| 96 | + | |
| 104 | 97 | chanResult.setVcCardNo(patients.getVcCardNo()); |
| 105 | 98 | chanResult.setCardNo(patients.getCardNo()); |
| 106 | 99 | chanResult.setRemark(patients.getMremark()); |
| ... | ... | @@ -130,6 +123,10 @@ |
| 130 | 123 | List <AntenatalExaminationModel> ant = null; |
| 131 | 124 | int i = 0; |
| 132 | 125 | if (CollectionUtils.isNotEmpty(chu)) { |
| 126 | + if (chu.get(0) != null){ | |
| 127 | + chanResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(chu.get(0).getCheckTime())); | |
| 128 | + } | |
| 129 | + | |
| 133 | 130 | for (AntExChuModel a : chu) {//唐山滦县导出判断初诊是否是本院 |
| 134 | 131 | if (StringUtils.isNotEmpty(a.getHospitalId())) { |
| 135 | 132 | if (a.getHospitalId().equals(hospital)) { |