jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 59d6e9e37e69319a72209c43b7241537b0795011

Authored by liquanyu
1 parent 4a5331632b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童隐藏档案修改

Showing 8 changed files with 37 additions and 36 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ 59d6e9e
... ... @@ -807,7 +807,7 @@
807 807  
808 808 Map<String, Object> param = new HashMap<>();
809 809 param.put("userId", userId);
810   - param.put("hospitalId", hospitalId);
  810 + //param.put("hospitalId", hospitalId);
811 811  
812 812 Map<String, Object> restMap = new HashMap<>();
813 813 restMap.put("topName", couponMapper.findTopName(hospitalId));
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 59d6e9e
... ... @@ -128,7 +128,7 @@
128 128 <select id="findInfo" parameterType="map" resultType="map">
129 129 select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status, c.type
130 130 from coupon_info a, coupon_template b, coupon_type c, hospital_coupon_template_group d
131   - where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id and d.hospital_id = #{hospitalId}
  131 + where a.user_id = #{userId} and a.coupon_template_id = b.id and b.type_id=c.id and d.hospital_id = #{hospitalId}
132 132 order by c.type desc, b.coupon_order desc
133 133 </select>
134 134  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ 59d6e9e
... ... @@ -544,7 +544,7 @@
544 544  
545 545 //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案
546 546 //建立隐藏档案
547   - babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId, "2");
  547 + //babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId, "2");
548 548  
549 549 babyPatientExtendEarFollowUpService.addBabyPatientExtendEarFollowUp(obj);
550 550  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 59d6e9e
... ... @@ -270,7 +270,8 @@
270 270 }
271 271  
272 272 //表示区域的
273   - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) {
  273 + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))
  274 + && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) {
274 275 if (babyModel == null)
275 276 {
276 277 babyModel = babyModel1;
... ... @@ -294,7 +295,7 @@
294 295 babyModel.setId(null);
295 296 babyModel.setHospitalId(hospitalId);
296 297 babyModel.setCreated(new Date());
297   - babyModel.setEnable("2");
  298 + // babyModel.setEnable("2");
298 299 babyBookbuildingService.addBabyBookbuilding(babyModel);
299 300 return babyModel.getId();
300 301 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 59d6e9e
... ... @@ -832,13 +832,13 @@
832 832  
833 833 String hospitalId = autoMatchFacade.getHospitalId(userId);
834 834 //表示区域的
835   - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
836   - String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
837   - if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
838   - //打印日志
839   - }
840   - request.setBuildId(parentId);
841   - }
  835 +// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
  836 +// String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
  837 +// if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
  838 +// //打印日志
  839 +// }
  840 +// request.setBuildId(parentId);
  841 +// }
842 842  
843 843 //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面
844 844 BabyModel bm = new BabyModel();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 59d6e9e
... ... @@ -1885,7 +1885,7 @@
1885 1885 //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案
1886 1886 //建立隐藏档案
1887 1887  
1888   - addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2");
  1888 + //addhideBabyEar(babyPatientExtendEarScreen.getBabyId(), hId, "2");
1889 1889  
1890 1890 /*0-追访概况 7 更新听力筛查数量*/
1891 1891 BabyModel model = new BabyModel();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java View file @ 59d6e9e
... ... @@ -134,13 +134,13 @@
134 134  
135 135 String hospitalId = autoMatchFacade.getHospitalId(userId);
136 136 //表示区域的
137   - if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
138   - String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
139   - if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
140   - //打印日志
141   - }
142   - request.setBuildId(parentId);
143   - }
  137 +// if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
  138 +// String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1);
  139 +// if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) {
  140 +// //打印日志
  141 +// }
  142 +// request.setBuildId(parentId);
  143 +// }
144 144 BabySpecialDiseaseClinicModel model = getBabySpecialDiseaseClinicModel(request);
145 145 model.setCheckDate(new Date());
146 146 model.setHospitalId(hospitalId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 59d6e9e
... ... @@ -137,22 +137,22 @@
137 137 return true;
138 138 }
139 139  
140   - List <String> hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true);
141   - if (CollectionUtils.isNotEmpty(hospitalIds)) {
142   - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds)
143   - .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
144   - if (babyModel == null) {
145   - return false; // 需 要建档
146   - }
147   - babyModel.setId(null);
148   - babyModel.setHospitalId(hospitalId);
149   - babyModel.setEnable("2");
150   - babyModel.setSource(babyId);
151   - babyModel.setCreated(new Date());
152   -// mongoTemplate.save(babyModel);
153   - babyBookbuildingService.addBabyBookbuilding(babyModel);
154   - return true;
155   - }
  140 +// List <String> hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true);
  141 +// if (CollectionUtils.isNotEmpty(hospitalIds)) {
  142 +// BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds)
  143 +// .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
  144 +// if (babyModel == null) {
  145 +// return false; // 需 要建档
  146 +// }
  147 +// babyModel.setId(null);
  148 +// babyModel.setHospitalId(hospitalId);
  149 +// babyModel.setEnable("2");
  150 +// babyModel.setSource(babyId);
  151 +// babyModel.setCreated(new Date());
  152 +//// mongoTemplate.save(babyModel);
  153 +// babyBookbuildingService.addBabyBookbuilding(babyModel);
  154 +// return true;
  155 +// }
156 156 return false;
157 157 }
158 158