操作人

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

@@ -212,28 +212,27 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         for (DeptInfo deptInfo : deptVitalDTOList) {
             DeptVitalDTO deptVitalDTO = new DeptVitalDTO();
             BeanUtil.copyProperties(deptInfo, deptVitalDTO);
+            //取映射关系维护时间，不取科室维护时间
             if (deptVitalMap.get(deptInfo.getId()) != null) {
                 DeptVital deptVital = deptVitalMap.get(deptInfo.getId());
-                if (deptVital.getGmtModified().after(deptVital.getGmtCreate())) {
-                    deptVitalDTO.setGmtOperate(deptVital.getGmtModified());
-                    deptVitalDTO.setOperator(deptVital.getModifier());
-                } else {
-                    deptVitalDTO.setGmtOperate(deptVital.getGmtCreate());
-                    deptVitalDTO.setOperator(deptVital.getCreator());
-                }
+                deptVitalDTO.setGmtCreate(deptVital.getGmtCreate());
+                deptVitalDTO.setGmtModified(deptVital.getGmtModified());
+                deptVitalDTO.setCreator(deptVital.getCreator());
+                deptVitalDTO.setModifier(deptVital.getModifier());
+                deptVitalDTO.setGmtOperate(deptVitalDTO.getGmtModified());
+                deptVitalDTO.setOperator(deptVitalDTO.getModifier());
             }
             deptVitalDTOListRet.add(deptVitalDTO);
         }
-        List<String> userIds = deptVitalDTOListRet.stream().map(deptVitalDTO -> deptVitalDTO.getOperator()).collect(Collectors.toList());
+        List<String> userIds = deptVitalDTOListRet.stream().map(deptVitalDTO -> deptVitalDTO.getModifier()).collect(Collectors.toList());
         RespDTO<Map<String, String>> data = userServiceClient.getUserInfoByIds(userIds);
         Map<String, String> userInfos = data.data;
         for (DeptVitalDTO deptVitalDTO : deptVitalDTOListRet) {
             if (userInfos.get(deptVitalDTO.getOperator()) != null) {
-                deptVitalDTO.setOperatorName(deptVitalDTO.getOperator());
+                deptVitalDTO.setOperatorName(userInfos.get(deptVitalDTO.getOperator()));
             }
         }
         page.setRecords(deptVitalDTOListRet);
-
         return page;
     }
 

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -66,8 +67,12 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(DateUtil.now());
         }
-        introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-        introduceInfo.setGmtCreate(DateUtil.now());
+        Date now = DateUtil.now();
+        String userId = UserUtils.getCurrentPrincipleID();
+        introduceInfo.setCreator(userId);
+        introduceInfo.setGmtCreate(now);
+        introduceInfo.setModifier(userId);
+        introduceInfo.setGmtModified(now);
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
 
@@ -201,13 +206,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         IPage<IntroducePageDTO> introducePageDTOIPage = this.getIntroducePage(introducePageVO);
         List<IntroducePageDTO> records = introducePageDTOIPage.getRecords();
         for (IntroducePageDTO introducePageDTO : records) {
-            if (introducePageDTO.getGmtModified().after(introducePageDTO.getGmtCreate())) {
-                introducePageDTO.setOperator(introducePageDTO.getModifier());
-                introducePageDTO.setGmtOperate(introducePageDTO.getGmtModified());
-            } else {
-                introducePageDTO.setOperator(introducePageDTO.getCreator());
-                introducePageDTO.setGmtOperate(introducePageDTO.getGmtCreate());
-            }
+            introducePageDTO.setOperator(introducePageDTO.getModifier());
+            introducePageDTO.setGmtOperate(introducePageDTO.getGmtModified());
         }
         List<String> userIds = records.stream().map(introduceList -> introduceList.getOperator()).collect(Collectors.toList());
         RespDTO<Map<String, String>> userInfos = userServiceClient.getUserInfoByIds(userIds);

icssman-service/src/main/java/com/diagbot/facade/IntroduceMapFacade.java

@@ -62,11 +62,11 @@ public class IntroduceMapFacade extends IntroduceMapServiceImpl {
             introduceMap.setType(introduceMapVO.getType());
             introduceMap.setCreator(UserUtils.getCurrentPrincipleID());
             introduceMap.setGmtCreate(DateUtil.now());
-        } else {
-            //已有关系更新时间
-            introduceMap.setGmtModified(DateUtil.now());
-            introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
         }
+        //已有关系更新时间
+        introduceMap.setGmtModified(DateUtil.now());
+        introduceMap.setModifier(UserUtils.getCurrentPrincipleID());
+
         this.saveOrUpdate(introduceMap);
         return true;
     }

icssman-service/src/main/java/com/diagbot/service/EnumsDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.impl.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
@@ -25,6 +26,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
+                .addEnums("introducePositionEnum", IntroducePositionEnum.values())
                 .build();
         return enumMap;
     }