Commit 431a71a7ef66d2ac78423d1148b0c84e4f625541
1 parent
71f57f0821
Exists in
master
and in
1 other branch
自动生成追访信息
Showing 1 changed file with 13 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
431a71a
| ... | ... | @@ -3,10 +3,7 @@ |
| 3 | 3 | import com.lyms.platform.biz.service.*; |
| 4 | 4 | import com.lyms.platform.common.enums.*; |
| 5 | 5 | import com.lyms.platform.common.result.*; |
| 6 | -import com.lyms.platform.common.utils.DateUtil; | |
| 7 | -import com.lyms.platform.common.utils.EnumUtil; | |
| 8 | -import com.lyms.platform.common.utils.StringUtils; | |
| 9 | -import com.lyms.platform.common.utils.SystemConfig; | |
| 6 | +import com.lyms.platform.common.utils.*; | |
| 10 | 7 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 11 | 8 | import com.lyms.platform.operate.web.service.ITrackDownService; |
| 12 | 9 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| ... | ... | @@ -164,9 +161,14 @@ |
| 164 | 161 | if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) { |
| 165 | 162 | temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉 |
| 166 | 163 | MaternalDeliverModel maternalDeliverModel = list2.get(0); |
| 167 | - /** 生产方式 */ | |
| 168 | - temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); | |
| 169 | - }else{ | |
| 164 | + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { | |
| 165 | + Map<String, String> deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); | |
| 166 | + if(deliveryModeMap.containsKey("fmfs")){ | |
| 167 | + /** 生产方式 */ | |
| 168 | + temp.put("fmType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); | |
| 169 | + } | |
| 170 | + } | |
| 171 | + } else { | |
| 170 | 172 | temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 |
| 171 | 173 | } |
| 172 | 174 | } |
| ... | ... | @@ -241,7 +243,7 @@ |
| 241 | 243 | } |
| 242 | 244 | } |
| 243 | 245 | |
| 244 | - if(trackDownRecord.getTrackType()>TrackDownDateEnums.A.getId()){ | |
| 246 | + if (trackDownRecord.getTrackType() > TrackDownDateEnums.A.getId()) { | |
| 245 | 247 | temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉 |
| 246 | 248 | } |
| 247 | 249 | isExitTrackDown(trackDownRecord, temp); |
| ... | ... | @@ -287,7 +289,7 @@ |
| 287 | 289 | temp.put("bookbuild", 1); // 孕期建档 1=勾勾 2=叉叉 |
| 288 | 290 | |
| 289 | 291 | //终止妊娠,或自动分娩 |
| 290 | - if ((patient.getDueStatus()!=null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { | |
| 292 | + if ((patient.getDueStatus() != null && patient.getDueStatus() == 1) || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) { | |
| 291 | 293 | temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 |
| 292 | 294 | } else if (patient.getType() == 3) { //本院已分娩 |
| 293 | 295 | if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) { |
| ... | ... | @@ -306,7 +308,7 @@ |
| 306 | 308 | MaternalDeliverModel maternalDeliverModel = list2.get(0); |
| 307 | 309 | /** 生产方式 */ |
| 308 | 310 | temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); |
| 309 | - }else{ | |
| 311 | + } else { | |
| 310 | 312 | temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 |
| 311 | 313 | } |
| 312 | 314 | } |
| ... | ... | @@ -325,7 +327,7 @@ |
| 325 | 327 | temp.put("chfc", 1); |
| 326 | 328 | temp.put("chfcCount", postInt); // 复查次数 |
| 327 | 329 | } else { |
| 328 | - if (patient.getDueStatus()!=null && patient.getDueStatus() == 1) {//终止妊娠 | |
| 330 | + if (patient.getDueStatus() != null && patient.getDueStatus() == 1) {//终止妊娠 | |
| 329 | 331 | //当前孕妇是孕28周后，进入产后复查追访，否则结束流程 |
| 330 | 332 | int dueWeek = DateUtil.getWeek2(patient.getLastMenses(), patient.getFmDate()); |
| 331 | 333 | if (dueWeek < 28) {//进入产后复查 |