Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -3,6 +3,10 @@
  */
 package com.diagbot.dto;
 
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -109,4 +113,17 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
+	/**
+	 * 系统时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value="系统时间")
+	private Date systemTime;
+	
+	/**
+     * 门诊号
+     */
+	@ApiModelProperty(value="门诊号")
+	private String recordId;
+	
 }

icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -1,5 +1,10 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
@@ -7,13 +12,10 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -43,7 +45,10 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      * @return
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-    	return baseMapper.getTopPatientInfo(getTopPatientInfoVO);
+    	GetTopPatientInfoDTO getTopPatientInfoDTO = baseMapper.getTopPatientInfo(getTopPatientInfoVO);
+    	getTopPatientInfoDTO.setSystemTime(DateUtil.now());
+    	getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
+    	return getTopPatientInfoDTO;
     }
     
     /**

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -139,7 +139,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 		templateInfoNew.in("id", splitIds)
 		               .eq("is_deleted", IsDeleteEnum.N.getKey())
 		               .set("is_deleted",IsDeleteEnum.Y.getKey())
-		               .set("modifier",UserUtils.getCurrentPrincipleID())
+		               //.set("modifier",UserUtils.getCurrentPrincipleID())
 		               .set("gmt_modified",DateUtil.now());
 		boolean res = update(new TemplateInfo(), templateInfoNew);
 		

icss-service/src/main/java/com/diagbot/vo/GetTopPatientInfoVO.java

@@ -47,5 +47,13 @@ public class GetTopPatientInfoVO {
 	@ApiModelProperty(value="医院患者编号",required=true)
 	@NotBlank(message="医院患者编号必填")
 	private String patientCode;
+	
+	/**
+	 * 门诊号
+	 */
+	@ApiModelProperty(value="门诊号",required=true)
+	@NotBlank(message="门诊号必填")
+	private String recordId;
+	
 
 }

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -66,7 +66,7 @@ public class TemplateInfoController {
 
     @ApiOperation(value = "保存病历模板[by:wangfeng]",notes = "modeName;//模板名字</br>"
 			+ "doctorId;//医生id</br>hospitalId;//医院id</br>hospitalDeptId;//部门id</br>"
-			+ "modeType;//模板类型</br>preview;//预览文本</br>dataJson;//模板数据</br>")
+			+ "modeType;//模板类型</br>preview;//预览文本</br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson;//模板数据</br>")
     @PostMapping("/saveTemplateInfo")
     @SysLogger("saveTemplateInfo")
     @Transactional

icssman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -2,12 +2,12 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.UserServiceHystrix;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserNameDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,7 +19,7 @@ import java.util.List;
 public interface UserServiceClient {
 
     @PostMapping(value = "/user/getUserInfoByIds")
-    RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<Long> ids);
+    RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids);
 }
 
 

icssman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -2,12 +2,12 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserNameDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -20,7 +20,7 @@ import java.util.List;
 public class UserServiceHystrix implements UserServiceClient {
 
 	@Override
-    public RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<Long> ids){
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
         log.error("【hystrix】调用{}异常", "getUserInfoByIds");
         return null;
     }

icssman-service/src/main/java/com/diagbot/dto/UserNameDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/12/10 15:15
- */
-@Getter
-@Setter
-public class UserNameDTO {
-    private Long id;//用户ID
-    private String username;// 用户名
-}

user-service/src/main/java/com/diagbot/dto/UserNameDTO.java

@@ -1,16 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/12/10 15:15
- */
-@Getter
-@Setter
-public class UserNameDTO {
-    private Long id;//用户ID
-    private String username;// 用户名
-}

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -21,7 +21,6 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
 import com.diagbot.dto.UserLoginDTO;
-import com.diagbot.dto.UserNameDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.JWT;
@@ -44,7 +43,6 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.idc.VisibleIdCreater;
-import com.diagbot.service.TokenService;
 import com.diagbot.service.impl.UserServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -1440,9 +1438,20 @@ public class UserFacade extends UserServiceImpl {
      * @param ids 用户ID列表
      * @return 用户名信息列表
      */
-    public List<UserNameDTO> getUserInfoByIds(List<Long> ids) {
-        List<User> userList = this.getByIds(ids);
-        List<UserNameDTO> res = BeanUtil.listCopyTo(userList, UserNameDTO.class);
-        return res;
+    public Map<String, String> getUserInfoByIds(List<String> ids) {
+        List<Long> longList = new ArrayList<>();
+        for (String id : ids){
+            if(!longList.contains(id)){
+                longList.add(Long.valueOf(id));
+            }
+        }
+        List<User> userList = this.getByIds(longList);
+        Map<String, String> map = new HashMap<>();
+        if (ListUtil.isNotEmpty(userList)){
+            for (User user: userList){
+                map.put(user.getId().toString(), user.getUsername());
+            }
+        }
+        return map;
     }
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -7,7 +7,6 @@ import com.diagbot.dto.JwtDTO;
 import com.diagbot.dto.LoginDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserLoginDTO;
-import com.diagbot.dto.UserNameDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.Permission;
 import com.diagbot.entity.Token;
@@ -353,7 +352,7 @@ public class UserController {
     @PostMapping("/getUserInfoByIds")
     @SysLogger("getUserInfoByIds")
     @ApiIgnore
-    public RespDTO<List<UserNameDTO>> getUserInfoByIds(@RequestBody List<Long> ids){
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
         return RespDTO.onSuc(userFacade.getUserInfoByIds(ids));
     }
 }