liquanyu / regional-platform

Download as
Browse Code »

Commit c390ec0c75da1a1ffc9d37eb21786ebac84bb936

Authored by hujiaqi
2 parents 7dfd26ac62 178301a2d3
Exists in master and in 2 other branches 0116, dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ c390ec0
... ... @@ -77,22 +77,22 @@
77 77 */
78 78 public String handHideBuild(String pid, String parentId, Integer userId, int type) {
79 79 String hospitalId = autoMatchFacade.getHospitalId(userId);
80   -
  80 + Patients patients=null;
  81 + Patients patients1 = patientsService.findOnePatientById(parentId);
  82 + if(StringUtils.isEmpty(pid)){
  83 + pid=patients1.getPid();
  84 + }
81 85 List li = new ArrayList();
82 86 li.add(hospitalId);
83   - Patients patients = findOnePatient(null, null, null, li, type, false, pid, true);
  87 + patients = findOnePatient(null, null, null, li, type, false, pid, true);
84 88 //表示本院已经有隐藏建档
85 89 if (null != patients) {
86 90 return patients.getId();
87 91 }
88   -
89   - Patients patients1 = patientsService.findOnePatientById(parentId);
90   -
91 92 if (patients1.getHospitalId().equals(hospitalId)) {
92 93 return patients1.getId();
93 94 }
94 95  
95   -
96 96 //表示区域的
97 97 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) {
98 98 patients = findOnePatient(null, null, null, null, type, false, pid, false);
99 99  
... ... @@ -101,9 +101,9 @@
101 101 patients.setHospitalId(hospitalId);
102 102 // patients.setType(1);
103 103 patients.setCreated(new Date());
104   - patients.setBookbuildingDoctor(userId + "");
  104 + patients.setBookbuildingDoctor(patients.getBookbuildingDoctor());
105 105 patients.setEnable("2");
106   - patients.setBookbuildingDate(new Date());
  106 + patients.setBookbuildingDate(patients.getBookbuildingDate());
107 107 patients.setVcCardNo(null);
108 108 patients.setFileCode(null);
109 109 patientsService.addPatient(patients);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ c390ec0
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5 5 import com.lyms.platform.common.enums.*;
  6 +import com.lyms.platform.common.exception.BusinessException;
6 7 import com.lyms.platform.common.result.BaseListResponse;
7 8 import com.lyms.platform.common.result.BaseObjectResponse;
8 9 import com.lyms.platform.common.result.BaseResponse;
9 10  
10 11  
... ... @@ -301,10 +302,16 @@
301 302 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
302 303 String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId,-1);
303 304 if (StringUtils.isEmpty(parentId)) {
  305 + throw new BusinessException();
304 306 //打印日志
  307 + }else {
  308 + sieveApplyOrderModel.setParentId(parentId);
  309 + sieveApplyOrderAddRequest.setParentId(parentId);
  310 + Patients p=patientsService.findOnePatientById(parentId);
  311 +
  312 + //加入产筛
  313 + patientsService.validata(p);
305 314 }
306   - sieveApplyOrderModel.setParentId(parentId);
307   - sieveApplyOrderModel.setParentId(parentId);
308 315 }
309 316  
310 317  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ c390ec0
... ... @@ -719,7 +719,7 @@
719 719 List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
720 720 if (CollectionUtils.isNotEmpty(data)) {
721 721 //身份证类型得到丈夫的生日 必须为身份证类型
722   - if ("SFZ".endsWith(data.get(0).getCode())) {
  722 + if (StringUtils.isNotEmpty(data.get(0).getCode())&&"SFZ".endsWith(data.get(0).getCode())) {
723 723 String cardNo = yunRequest.getHusbandCertificateNum();
724 724 Date birth = StringUtils.getBirthDay(cardNo);
725 725 patient.setHusbandBirth(birth);