fangcheng / regional-platform

Download as
Browse Code »

Commit 63ae8ccaaaa092494c556a1e4d7aebdff235a04d

Authored by jiangjiazhi
1 parent 2c9433f905
Exists in master

修改产检删除

Showing 4 changed files with 10 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 63ae8cc
... ... @@ -72,12 +72,12 @@
72 72 * @param userId
73 73 * @return
74 74 */
75   - public String handHideBuild(String pid, String parentId, Integer userId) {
  75 + public String handHideBuild(String pid, String parentId, Integer userId,int type) {
76 76 String hospitalId = autoMatchFacade.getHospitalId(userId);
77 77  
78 78 List li = new ArrayList();
79 79 li.add(hospitalId);
80   - Patients patients = findOnePatient(null, null, null, li, 1, false, pid, true);
  80 + Patients patients = findOnePatient(null, null, null, li, type, false, pid, true);
81 81 //表示本院已经有隐藏建档
82 82 if (null != patients) {
83 83 return patients.getId();
84 84  
... ... @@ -92,11 +92,11 @@
92 92  
93 93 //表示区域的
94 94 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) {
95   - patients = findOnePatient(null, null, null, null, 1, false, pid, false);
  95 + patients = findOnePatient(null, null, null, null, type, false, pid, false);
96 96 patients.setSource(patients.getId());
97 97 patients.setId(null);
98 98 patients.setHospitalId(hospitalId);
99   - patients.setType(1);
  99 +// patients.setType(1);
100 100 patients.setCreated(new Date());
101 101 patients.setBookbuildingDoctor(userId + "");
102 102 patients.setEnable("2");
... ... @@ -177,7 +177,7 @@
177 177 AntenatalExaminationModel model = antExAddRequest.convertToDataModel();
178 178 //表示区域的
179 179 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
180   - String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId);
  180 + String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId,1);
181 181 if (StringUtils.isEmpty(parentId)) {
182 182 //打印日志
183 183 }
... ... @@ -315,7 +315,7 @@
315 315  
316 316 //表示区域的
317 317 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
318   - String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId);
  318 + String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId,1);
319 319 if (StringUtils.isEmpty(parentId)) {
320 320 //打印日志
321 321 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 63ae8cc
... ... @@ -84,7 +84,7 @@
84 84 String hospital = autoMatchFacade.getHospitalId(userId);
85 85 //表示区域的
86 86 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital))) {
87   - String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId);
  87 + String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId,-1);
88 88 if (StringUtils.isEmpty(parentId)) {
89 89 //打印日志
90 90 }
... ... @@ -295,7 +295,7 @@
295 295  
296 296 //表示区域的
297 297 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
298   - String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId);
  298 + String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId,-1);
299 299 if (StringUtils.isEmpty(parentId)) {
300 300 //打印日志
301 301 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 63ae8cc
... ... @@ -134,7 +134,7 @@
134 134  
135 135 //表示区域的
136 136 if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) {
137   - String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId);
  137 + String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId,-1);
138 138 if (StringUtils.isEmpty(parentId)) {
139 139 logger.warn("get handHideBuild parentId is null.");
140 140 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 63ae8cc
... ... @@ -81,7 +81,7 @@
81 81 if(StringUtils.isNotEmpty(groupId)){
82 82 OrganizationGroups gorp= groupsService.findById(groupId);
83 83 if (gorp.getbType()!=1) {
84   - String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId);
  84 + String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId,3);
85 85 if (StringUtils.isEmpty(parentId)) {
86 86 //打印日志
87 87 }