Commit c1ec70aa63c162c3faecc0e9af42c0a942a6ac1c
1 parent
ebef896e88
Exists in
master
and in
6 other branches
分娩
Showing 2 changed files with 21 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
View file @
c1ec70a
| ... | ... | @@ -273,7 +273,7 @@ |
| 273 | 273 | |
| 274 | 274 | |
| 275 | 275 | FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); |
| 276 | - if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) { | |
| 276 | + if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) { | |
| 277 | 277 | PatientsQuery query = new PatientsQuery(); |
| 278 | 278 | query.setYn(YnEnums.YES.getId()); |
| 279 | 279 | query.setType(1); //孕妇 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
c1ec70a
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | import com.lyms.hospitalapi.Cdfy.CdfyHisService; |
| 4 | 4 | import com.lyms.hospitalapi.dzfy.DzfyHisService; |
| 5 | 5 | import com.lyms.hospitalapi.fnfy.FnfyHisService; |
| 6 | +import com.lyms.hospitalapi.qhdfy.QhdfyFmService; | |
| 6 | 7 | import com.lyms.hospitalapi.qhdfy.QhdfyHisService; |
| 7 | 8 | import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; |
| 8 | 9 | import com.lyms.hospitalapi.v2.HisService; |
| 9 | 10 | |
| ... | ... | @@ -150,10 +151,14 @@ |
| 150 | 151 | |
| 151 | 152 | @Autowired |
| 152 | 153 | private ITrackDownService trackDownService; |
| 154 | + | |
| 153 | 155 | @Autowired |
| 154 | 156 | private TrackDownRecordService trackDownRecordService; |
| 155 | 157 | |
| 156 | 158 | @Autowired |
| 159 | + private QhdfyFmService qhdfyFmService; | |
| 160 | + | |
| 161 | + @Autowired | |
| 157 | 162 | private CdfyHisService cdfyHisService; |
| 158 | 163 | |
| 159 | 164 | |
| 160 | 165 | |
| ... | ... | @@ -383,16 +388,24 @@ |
| 383 | 388 | } |
| 384 | 389 | } |
| 385 | 390 | |
| 386 | - if (type == ServiceObjEnums.YUNOBJ.getId()) { | |
| 387 | - final Patients tempP = p; | |
| 388 | - commonThreadPool.execute(new Runnable() { | |
| 389 | - @Override | |
| 390 | - public void run() { | |
| 391 | + | |
| 392 | + final Patients tempP = p; | |
| 393 | + commonThreadPool.execute(new Runnable() { | |
| 394 | + @Override | |
| 395 | + public void run() { | |
| 396 | + if (tempP.getType() == ServiceObjEnums.YUNOBJ.getId()) { | |
| 391 | 397 | //生成建档短信 |
| 392 | 398 | createBuildMsg(tempP); |
| 393 | 399 | } |
| 394 | - }); | |
| 395 | - } | |
| 400 | + //秦皇岛建档获取分娩信息 | |
| 401 | + if ("4".equals(HIS_VERSION) && "216".equals(tempP.getHospitalId())) { | |
| 402 | + Date startDate = DateUtil.addMonth(new Date(),-3); | |
| 403 | + Date endDate = DateUtil.addDay(new Date(), 1); | |
| 404 | + qhdfyFmService.syncByCardNo(DateUtil.getyyyy_MM_dd(startDate),DateUtil.getyyyy_MM_dd(endDate),tempP.getCardNo()); | |
| 405 | + } | |
| 406 | + } | |
| 407 | + }); | |
| 408 | + | |
| 396 | 409 | |
| 397 | 410 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 398 | 411 | br.setErrormsg("成功"); |