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

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

@@ -1,25 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.UserServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
-public interface UserServiceClient {
-
-    @PostMapping(value = "/user/{username}")
-    RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
-}
-
-
-

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

@@ -1,23 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-public class UserServiceHystrix implements UserServiceClient {
-
-    @Override
-    public RespDTO<User> getUser(String token, String username) {
-        System.out.println(token);
-        System.out.println(username);
-        return null;
-    }
-}

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

@@ -8,7 +8,7 @@ import lombok.Setter;
 /**
  * 
  * @author wangfeng
- * @Description: 医生病例模板出参
+ * @Description: 医生病历模板出参
  * @date 2018年11月16日 上午10:40:27
  */
 @Getter

icss-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -9,8 +9,7 @@ import lombok.Setter;
  * @time: 2018/11/21 11:39
  */
 public enum QuestionTypeEnum implements KeyedNamed {
-    Mainsuit(1, "主诉"),
-    Symptom(2, "现病史"),
+    Symptom(1, "症状"),
     Other(3, "其他史"),
     Vital(4, "查体"),
     Lis(5, "化验"),

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

@@ -117,7 +117,7 @@ public class PushFacade {
             pushDTO.setDisMap(disMap);
         }
         //症状(主诉 type=1;现病史 type=2) 返回 tagName+填写单
-        else if (featureTypeSet.contains(QuestionTypeEnum.Mainsuit.getKey()) || featureTypeSet.contains(QuestionTypeEnum.Symptom.getKey())) {
+        else if (featureTypeSet.contains(QuestionTypeEnum.Symptom.getKey())) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     in("tag_name", symptomMap.keySet()).

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

@@ -20,7 +20,7 @@ import com.diagbot.vo.TemplateInfosVO;
 
 /**
  * @author wangfeng
- * @Description: 病例模板
+ * @Description: 病历模板
  * @date 2018年11月16日 上午11:24:36
  */
 @Component
@@ -28,8 +28,8 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 
 	/**
 	 * 
-	 * @param templateInfo
-	 * @return 医生病例模板信息
+	 * @param templateInfoVO
+	 * @return 医生病历模板信息
 	 */
 	public List<TemplateInfoDTO> findByDoctorIdTemplates(TemplateInfoVO templateInfoVO) {
 		//根据传入的医生id和部门id还有医院id在数据表中查出相应的模板数据

icss-service/src/main/java/com/diagbot/mapper/TemplateInfoMapper.java

@@ -16,7 +16,7 @@ import com.diagbot.entity.TemplateInfo;
  */
 public interface TemplateInfoMapper extends BaseMapper<TemplateInfo> {
 	
-	//根据医生id查询该医生保存的病例模板
+	//根据医生id查询该医生保存的病历模板
 	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
 
 }

icss-service/src/main/java/com/diagbot/service/TemplateInfoService.java

@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TemplateInfoService extends IService<TemplateInfo> {
 	
-	//根据医生id查询该医生保存的病例模板
+	//根据医生id查询该医生保存的病历模板
 	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo);
 	
 	public boolean updateById(TemplateInfo templateInfo);

icss-service/src/main/java/com/diagbot/service/impl/TemplateInfoServiceImpl.java

@@ -22,7 +22,7 @@ import com.diagbot.service.TemplateInfoService;
 public class TemplateInfoServiceImpl extends ServiceImpl<TemplateInfoMapper, TemplateInfo> implements TemplateInfoService {
 
 	/**
-	 * 根据医生id查询该医生保存的病例模板
+	 * 根据医生id查询该医生保存的病历模板
 	 */
 	@Override
 	public List<TemplateInfoDTO> findByDoctorIdTemplate(TemplateInfo templateInfo) {

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

@@ -9,7 +9,7 @@ import lombok.Setter;
 /**
  * 
  * @author wangfeng
- * @Description: 病例保存
+ * @Description: 病历保存
  * @date 2018年11月16日 下午3:35:05
  */
 @Getter

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

@@ -28,19 +28,19 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 
  * @author wangfeng
- * @Description:  病例模板表 前端控制器
+ * @Description:  病历模板表 前端控制器
  * @date 2018年11月16日 上午9:14:51
  */
 @RestController
 @RequestMapping("/templateInfo")
-@Api(value = "病例模板API[by:wangfeng]", tags = { "病例模板API" })
+@Api(value = "病历模板API[by:wangfeng]", tags = { "病历模板API" })
 @SuppressWarnings("unchecked")
 public class TemplateInfoController {
 	
 	@Autowired
 	TemplateInfoFacade templateInfoFacade;
 	
-    @ApiOperation(value = "根据医生id、医院id、部门id返回病例模板内容[by:wangfeng]",
+    @ApiOperation(value = "根据医生id、医院id、部门id返回病历模板内容[by:wangfeng]",
     		notes = "doctorId: 医生id<br>" +"dospitalId：医院编码<br>"+"deptId:部门id<br>")
     @PostMapping("/getByDoctorIdTemplates")
     @SysLogger("getByDoctorIdTemplates")
@@ -64,7 +64,7 @@ public class TemplateInfoController {
     }
 
 
-    @ApiOperation(value = "保存病例模板[by:wangfeng]",notes = "保存病例模板")
+    @ApiOperation(value = "保存病历模板[by:wangfeng]",notes = "保存病历模板")
     @PostMapping("/saveTemplateInfo")
     @SysLogger("saveTemplateInfo")
     @Transactional
@@ -75,7 +75,7 @@ public class TemplateInfoController {
     	return RespDTO.onSuc(res);
     }
     
-    @ApiOperation(value = "根据模板id批量删除病例模板[by:wangfeng]",notes = "ids: 模板ids<br>'ids':'1,2,3,4,5,6'")
+    @ApiOperation(value = "根据模板id批量删除病历模板[by:wangfeng]",notes = "ids: 模板ids<br>'ids':'1,2,3,4,5,6'")
     @PostMapping("/cancelTemplateInfos")
     @SysLogger("cancelTemplateInfos")
     @Transactional

icss-service/src/main/resources/mapper/TemplateInfoMapper.xml

@@ -19,7 +19,7 @@
         <result column="data_json" property="dataJson" />
         <result column="remark" property="remark" />
     </resultMap>
-    <!--根据医生id查询该医生保存的病例模板 -->
+    <!--根据医生id查询该医生保存的病历模板 -->
 	<select id="findByDoctorIdTemplate" resultType="com.diagbot.dto.TemplateInfoDTO">
 	SELECT
 		id AS id,

icssman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -9,8 +9,7 @@ import lombok.Setter;
  * @time: 2018/11/21 11:39
  */
 public enum QuestionTypeEnum implements KeyedNamed {
-    Mainsuit(1, "主诉"),
-    Symptom(2, "现病史"),
+    Symptom(1, "症状"),
     Other(3, "其他史"),
     Vital(4, "查体"),
     Lis(5, "化验"),