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

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -80,7 +80,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -80,7 +80,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -80,7 +80,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -80,7 +80,7 @@ mybatis-plus:
       #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
       id-type: id_worker
       #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
+      field-strategy: 1
       #驼峰下划线转换
       column-underline: true
       #数据库大写下划线转换

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/dto/RetrievalDTO.java

@@ -15,4 +15,6 @@ public class RetrievalDTO {
     private String name;
     //标签id
     private Long questionId;
+    //显示类型
+    private Integer showType;
 }

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/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/resources/mapper/RetrievalMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
 
     <select id="getSymptopInfo" resultType="com.diagbot.dto.RetrievalDTO">
-        SELECT c.`name`,c.id as question_id FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -33,7 +33,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT c.`name`,c.id as question_id FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'
@@ -50,7 +50,7 @@
             and c.sex_type in ('3',#{sexType})
         </if>
         UNION
-        SELECT c.`name`,c.id as question_id FROM icss_retrieval a
+        SELECT c.`name`,c.id as question_id,b.show_type FROM icss_retrieval a
         LEFT JOIN icss_retrieval_mapping b ON a.id = b.retrieval_id
         LEFT JOIN icss_question_info c ON b.question_id = c.id
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N' AND c.is_deleted = 'N'

icssman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -30,6 +30,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
 //                .antMatchers("/introduceInfo/saveIntroduce").permitAll()
 //                .antMatchers("/questionInfo/delete").permitAll()
 //                .antMatchers("/questionInfo/index").permitAll()
+//                .antMatchers("/getIcssEnumsData").permitAll()
 //                .antMatchers("/**").authenticated();
                 .antMatchers("/**").permitAll();
     }

icssman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -90,6 +90,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
                 || matchers("/file/upload", request)
+                || matchers("/getIcssEnumsData", request)
                 || matchers("introduceInfo/saveIntroduce", request)
                 || matchers("/questionInfo/delete", request)
                 || matchers("/questionInfo/index", request)

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

@@ -0,0 +1,30 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.EnumsDataService;
+import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据装饰类
+ * @author: gaodm
+ * @time: 2018/9/19 14:28
+ */
+@Component
+public class EnumsDataFacade {
+    @Autowired
+    private EnumsDataService enumsDataService;
+
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
+        return enumsDataService.getEnumsData();
+    }
+
+}

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

@@ -55,6 +55,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         }
         QuestionUsual questionUsual = new QuestionUsual();
         questionUsual.setCreator(UserUtils.getCurrentPrincipleID());
+        questionUsual.setModifier(UserUtils.getCurrentPrincipleID());
         questionUsual.setGmtCreate(DateUtil.now());
         questionUsual.setQuestionId(questionInfoRespDTO.getId());
         questionUsual.setDeptId(listRespDTO.get(0).getId());

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

@@ -0,0 +1,31 @@
+package com.diagbot.service;
+
+import com.diagbot.enums.QuestionTypeEnum;
+import com.diagbot.service.impl.EnumsDataService;
+import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据接口是实现类
+ * @author: gaodm
+ * @time: 2018/9/19 14:27
+ */
+@Service
+public class EnumsDataServiceImpl implements EnumsDataService {
+
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    @Override
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
+        Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
+                .addEnums("questionTypeEnum", QuestionTypeEnum.values())
+                .build();
+        return enumMap;
+    }
+}

icssman-service/src/main/java/com/diagbot/service/impl/EnumsDataService.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.util.EnumEntriesBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 枚举数据接口类
+ * @author: gaodm
+ * @time: 2018/9/19 14:25
+ */
+public interface EnumsDataService {
+    /**
+     * 用户枚举数据获取
+     *
+     * @return 用户枚举类map
+     */
+    Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData();
+}

icssman-service/src/main/java/com/diagbot/web/EnumsController.java

@@ -0,0 +1,35 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.EnumsDataFacade;
+import com.diagbot.util.EnumEntriesBuilder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: ICSS后台管理枚举数据获取类
+ * @author: gaodm
+ * @time: 2018/9/19 14:32
+ */
+@RestController
+@Api(value = "ICSS后台管理枚举数据获取API", tags = { "ICSS后台管理枚举数据获取API" })
+@SuppressWarnings("unchecked")
+public class EnumsController {
+    @Autowired
+    private EnumsDataFacade enumsDataFacade;
+
+    @ApiOperation(value = "ICSS后台管理枚举数据获取[by:gaodm]",
+            notes = "ICSS后台管理枚举数据获取")
+    @PostMapping("/getIcssEnumsData")
+    @SysLogger("getIcssEnumsData")
+    public RespDTO<Map<String, List<EnumEntriesBuilder.Entry>>> getEnumsData() {
+        return RespDTO.onSuc(enumsDataFacade.getEnumsData());
+    }
+}