Zhaops 6 лет назад
Родитель
Сommit
0e8311d466

+ 9 - 5
icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -16,6 +16,7 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -29,12 +30,13 @@ import java.util.stream.Collectors;
  * @time: 2018/11/22 11:45
  */
 @Component
-public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalService {
+public class DeptVitalFacade extends DeptVitalServiceImpl {
 
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
     @Autowired
-    private DeptVitalServiceImpl deptVitalServiceImpl;
+    @Qualifier("deptVitalServiceImpl")
+    private DeptVitalService deptVitalService;
 
     /**
      * 保存查体模板
@@ -46,11 +48,11 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
         //先删除该科室原有模板
         UpdateWrapper<DeptVital> deptVitalUpdateWrapper = new UpdateWrapper<>();
         deptVitalUpdateWrapper.eq("dept_id", deptVitalVO.getDeptId()).
-                eq("is_deleted",IsDeleteEnum.N.getKey()).
+                eq("is_deleted", IsDeleteEnum.N.getKey()).
                 set("is_deleted", IsDeleteEnum.Y.getKey()).
                 set("modifier", UserUtils.getCurrentPrincipleID()).
                 set("gmt_modified", DateUtil.now());
-        this.update(new DeptVital(),deptVitalUpdateWrapper);
+        this.update(new DeptVital(), deptVitalUpdateWrapper);
 
         //查找标签是否存在
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
@@ -81,7 +83,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
             deptVitalList.add(deptVital);
         }
 
-        deptVitalServiceImpl.saveBatch(deptVitalList);
+        deptVitalService.saveBatch(deptVitalList);
         return true;
     }
 
@@ -105,6 +107,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
 
     /**
      * 删除科室查体模板标签-全删除
+     *
      * @param deptId
      * @return
      */
@@ -121,6 +124,7 @@ public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalSe
 
     /**
      * 根据部门获取查体模板
+     *
      * @param deptId
      * @return
      */

+ 5 - 2
icssman-service/src/main/java/com/diagbot/facade/VitalOrderFacade.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.VitalInfoDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.VitalOrderService;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
@@ -13,6 +14,7 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -27,7 +29,8 @@ import java.util.Map;
 public class VitalOrderFacade extends VitalOrderServiceImpl {
 
     @Autowired
-    VitalOrderServiceImpl vitalOrderServiceImpl;
+    @Qualifier("vitalOrderServiceImpl")
+    VitalOrderService vitalOrderService;
     @Autowired
     QuestionInfoFacade questionInfoFacade;
 
@@ -51,7 +54,7 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
             vitalOrder.setGmtModified(DateUtil.now());
             vitalOrderList.add(vitalOrder);
         }
-        vitalOrderServiceImpl.saveBatch(vitalOrderList);
+        vitalOrderService.saveBatch(vitalOrderList);
         return true;
     }