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/QuestionDTO.java

@@ -20,17 +20,18 @@ public class QuestionDTO {
     private Long id;// id
     private String name;//内容
     private String tagName;//标签名称
-    private Integer type;//类型（1：主诉 2：现病史 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
+    private Integer type;//类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
     private Integer controlType; //控件类型
     private Integer subType; //子类型
-    private String tagType; //标签标识(0：单项  1：组合项 2：填充项)
+    private String tagType; //标签标识
     private String labelPrefix; //前置内容
     private String labelSuffix; //后置内容
     private BigDecimal minValue; //最小值
     private BigDecimal maxValue; //最大值
-    private Integer position;    //显示位置(0：在标签后，1：在标签前)
-    private Integer formPosition;  //填写单显示位置(0：左， 1：上)
-    private Integer textGenerate;    //显示位置(0：在标签后，1：在标签前)
+    private Integer position;    //标签显示位置(0：在标签后，1：在标签前)
+    private Integer showAdd;    //是否显示+
+    private Integer formPosition; //填写单显示位置(0：左， 1：上)
+    private Integer textGenerate;  //文本生成规则
     private Integer symptomType; //主症状和伴随症状对应的question类型
     private Integer exclusionType; //互斥类型
     private String judgeType; //判断类型（0:本身异常；1:本身正常；2:数字范围；3:计算公式；9:无需判断）

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/entity/QuestionDetail.java

@@ -46,11 +46,22 @@ public class QuestionDetail implements Serializable {
      */
     private Long questionId;
 
+    /**
+     * question_relation
+     */
+    private Long questionRelation;
+
     /**
      * 排序号
      */
     private Integer orderNo;
 
+
+    /**
+     * 特殊类型
+     */
+    private Integer code;
+
     /**
      * 是否默认被选中（0：不选中，1：选中）
      */
@@ -62,4 +73,6 @@ public class QuestionDetail implements Serializable {
     private String remark;
 
 
+
+
 }

icss-service/src/main/java/com/diagbot/entity/QuestionInfo.java

@@ -111,6 +111,11 @@ public class QuestionInfo implements Serializable {
      */
     private Integer textGenerate;
 
+    /**
+     * 是否显示 +
+     */
+    private Integer showAdd;
+
     /**
      * 备注
      */

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/ModuleDetailFacade.java

@@ -1,16 +1,8 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.ModuleInfoDTO;
-import com.diagbot.entity.ModuleInfo;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.ModuleDetailServiceImpl;
-import com.diagbot.util.BeanUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @Description: 模型明细务层
  * @author: zhoutg
@@ -20,24 +12,4 @@ import java.util.List;
 public class ModuleDetailFacade extends ModuleDetailServiceImpl {
 
 
-    /**
-     * 返回所有的模型结构
-     *
-     * @return 模型结构
-     */
-    public List<ModuleInfoDTO> getAll() {
-        List<ModuleInfoDTO> data = new ArrayList<>();
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<ModuleInfo> list =  this.list(queryWrapper);
-        data = BeanUtil.listCopyTo(list, ModuleInfoDTO.class);
-        for(ModuleInfoDTO bean : data) {
-            QueryWrapper wrapper = new QueryWrapper();
-            wrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-            wrapper.eq("module_id", bean.getId());
-            wrapper.orderByAsc("order_no");
-        }
-        return data;
-    }
-
 }

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/QuestionFacade.java

@@ -4,7 +4,6 @@ import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
-import com.diagbot.enums.ControlTypeEnum;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -48,15 +47,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         BeanUtil.copyProperties(questionInfo, res);
 
         //获取明细项
-        if(ControlTypeEnum.EMPTY_TAG.getKey() != res.getControlType()) { //不为空标签
-            List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
-            res.setQuestionDetailList(questionDetailList);
-        }
-
-        //获取同级标签
-//        List<QuestionInfo> questionRelation = this.getByQuestionRelation(paramMap);
-//        List<QuestionDTO> questionRelationDTO = BeanUtil.listCopyTo(questionRelation, QuestionDTO.class);
-//        res.setQuestionRelationList(questionRelationDTO);
+        List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
+        res.setQuestionDetailList(questionDetailList);
 
         //获取子标签
         List<QuestionInfoWrapper> questionMapping = this.getByQuestionMapping(paramMap);
@@ -64,9 +56,25 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         res.setQuestionMapping(sonQuestionList);
         //获取子标签的明细项
         if(ListUtil.isNotEmpty(sonQuestionList)) {
+            Map paramMap1 = new HashMap<>();
+            paramMap1.put("sexType", questionVO.getSexType());
+            paramMap1.put("age", questionVO.getAge());
+
             for(QuestionDTO bean : sonQuestionList) {
-                List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(bean.getId());
-                bean.setQuestionDetailList(questionDetailList);
+                List<QuestionDetail> questionDetailList1 = questionDetailFacade.getByQuestionId(bean.getId());
+                bean.setQuestionDetailList(questionDetailList1);
+                paramMap1.put("id", bean.getId());
+                //获取第二级子标签
+                List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
+                List<QuestionDTO> sonQuestionList1 = BeanUtil.listCopyTo(questionMapping1, QuestionDTO.class);
+                bean.setQuestionMapping(sonQuestionList1);
+
+                for(QuestionDTO questionDTO : sonQuestionList1) {
+                    //获取二级子明细项
+                    List<QuestionDetail> questionDetailList2 = questionDetailFacade.getByQuestionId(questionDTO.getId());
+                    questionDTO.setQuestionDetailList(questionDetailList2);
+                }
+
             }
         }
         return res;

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, "化验"),