Commit 52090feae011e520e0a5c1fb280d11bd33d85d04
1 parent
3a7d2406b6
Exists in
master
and in
6 other branches
自动生成追访信息
Showing 1 changed file with 11 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
52090fe
| ... | ... | @@ -147,21 +147,25 @@ |
| 147 | 147 | |
| 148 | 148 | if (patients.getDueStatus() == 1 || (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 |
| 149 | 149 | temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 |
| 150 | - } else if (patients.getType() == 3) { | |
| 151 | - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 | |
| 150 | + } else if (patients.getType() == 3) { //本院已分娩 | |
| 152 | 151 | if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) { |
| 153 | 152 | /** 生产方式 */ |
| 154 | 153 | temp.put("fmType", "自动分娩"); |
| 154 | + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 | |
| 155 | 155 | } else { |
| 156 | 156 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 157 | 157 | matDeliverQuery.setParentId(patients.getId()); |
| 158 | 158 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 159 | + matDeliverQuery.setHospitalId(patients.getHospitalId()); | |
| 159 | 160 | //查询分娩记录 |
| 160 | 161 | List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); |
| 161 | 162 | if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { |
| 163 | + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 | |
| 162 | 164 | MaternalDeliverModel maternalDeliverModel = list2.get(0); |
| 163 | 165 | /** 生产方式 */ |
| 164 | 166 | temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); |
| 167 | + }else{ | |
| 168 | + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 | |
| 165 | 169 | } |
| 166 | 170 | } |
| 167 | 171 | } |
| 168 | 172 | |
| 169 | 173 | |
| 170 | 174 | |
| 171 | 175 | |
| ... | ... | @@ -284,20 +288,24 @@ |
| 284 | 288 | if (patient.getDueStatus() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩 |
| 285 | 289 | temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 |
| 286 | 290 | } else if (patient.getType() == 3) { //本院已分娩 |
| 287 | - temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 | |
| 288 | 291 | if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { |
| 289 | 292 | /** 生产方式 */ |
| 290 | 293 | temp.put("fmType", "自动分娩"); |
| 294 | + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 | |
| 291 | 295 | } else { |
| 292 | 296 | MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); |
| 293 | 297 | matDeliverQuery.setParentId(patient.getId()); |
| 294 | 298 | matDeliverQuery.setYn(YnEnums.YES.getId()); |
| 299 | + matDeliverQuery.setHospitalId(patient.getHospitalId()); | |
| 295 | 300 | //查询分娩记录 |
| 296 | 301 | List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery); |
| 297 | 302 | if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { |
| 303 | + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 | |
| 298 | 304 | MaternalDeliverModel maternalDeliverModel = list2.get(0); |
| 299 | 305 | /** 生产方式 */ |
| 300 | 306 | temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); |
| 307 | + }else{ | |
| 308 | + temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 | |
| 301 | 309 | } |
| 302 | 310 | } |
| 303 | 311 | } |