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

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

@@ -13,11 +13,10 @@ import java.util.Map;
 @Getter
 @Setter
 public class PushDTO {
-
     private Map<String, Object> symptomMap;
     private Map<String, Object> vitalMap;
-    private Map<String, Object> disMap;
     private Map<String, Object> labMap;
     private Map<String, Object> pacsMap;
+    private Map<String, Object> disMap;
 
 }

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

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.TranFieldInfo;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/21 14:08
+ */
+public class TranFieldInfoDTO extends TranFieldInfo {
+}

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

@@ -0,0 +1,170 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 字段对应表
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+public class TranFieldInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 唯一主键(通常是医院编码:hospitalId)
+     */
+    private String uuid;
+
+    /**
+     * icss需要的字段
+     */
+    private String icssField;
+
+    /**
+     * 医院个性化字段
+     */
+    private String hisField;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+    public String getIcssField() {
+        return icssField;
+    }
+
+    public void setIcssField(String icssField) {
+        this.icssField = icssField;
+    }
+    public String getHisField() {
+        return hisField;
+    }
+
+    public void setHisField(String hisField) {
+        this.hisField = hisField;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "TranFieldInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", uuid=" + uuid +
+        ", icssField=" + icssField +
+        ", hisField=" + hisField +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -5,11 +5,14 @@ import com.diagbot.dto.IntroduceDTO;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
 import com.diagbot.entity.IntroduceMap;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.IntroduceByQuestionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -27,15 +30,19 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     IntroduceMapFacade introduceMapFacade;
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
+    @Autowired
+    QuestionFacade questionFacade;
 
     /**
-     * 根据标签获取提示信息
+     * 根据标签id获取提示信息
      *
      * @param introduceByQuestionVO
      * @return
      */
-    public IntroduceDTO getByQuestion(IntroduceByQuestionVO introduceByQuestionVO) {
-
+    public IntroduceDTO getByQuestionId(IntroduceByQuestionVO introduceByQuestionVO) {
+        if (introduceByQuestionVO.getQuestionId() == null) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签id");
+        }
         QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
         introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("question_id", introduceByQuestionVO.getQuestionId()).
@@ -49,6 +56,38 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         return introduceDTO;
     }
 
+    /**
+     * 根据标签名称获取提示信息
+     *
+     * @param introduceByQuestionVO
+     * @return
+     */
+    public IntroduceDTO getByQuestionName(IntroduceByQuestionVO introduceByQuestionVO) {
+        if (StringUtil.isBlank(introduceByQuestionVO.getTagName())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签名称");
+        }
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("tag_name", introduceByQuestionVO.getTagName())
+                .eq("type", QuestionTypeEnum.Disease.getKey());
+        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
+        if (questionInfo == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "标签不存在");
+        }
+
+        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
+        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                eq("question_id", questionInfo.getId()).
+                eq("type", introduceByQuestionVO.getType());
+        IntroduceMap introduceMap = introduceMapFacade.getOne(introduceMapQueryWrapper);
+        if (introduceMap == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "提示信息未维护");
+        }
+
+        IntroduceDTO introduceDTO = this.getRecordById(introduceMap.getIntroduceId());
+        return introduceDTO;
+    }
+
     /**
      * 根据id获取提示信息
      *
@@ -72,4 +111,4 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introduceDTO.setIntroduceDetailList(introduceDetailList);
         return introduceDTO;
     }
-}
+}

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

@@ -7,19 +7,23 @@ import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.vo.PushVO;
+import com.diagbot.vo.QuestionVO;
 import com.diagbot.web.DeptInfoController;
 import com.google.common.collect.Lists;
 import com.sun.corba.se.impl.ior.OldJIDLObjectKeyTemplate;
 import com.sun.xml.internal.ws.config.metro.dev.FeatureReader;
+import org.aspectj.weaver.patterns.TypePatternQuestions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -82,7 +86,6 @@ public class PushFacade {
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
-
         searchData.setFeatureType(pushVO.getFeatureType());
         searchData.setSysCode("1");
         searchData.setLength(10);
@@ -99,51 +102,71 @@ public class PushFacade {
         Map<String, Object> labMap = list2Map(labs);
         Map<String, Object> pacsMap = list2Map(pacs);
 
-        //症状(主诉 type=1;现病史 type=2) 返回 tagName+id
-        if (featureTypeSet.contains("1") || featureTypeSet.contains("2")) {
+        if (featureTypeSet.contains(QuestionTypeEnum.Lis.getKey())) {
+            pushDTO.setLabMap(labMap);
+        } else if (featureTypeSet.contains(QuestionTypeEnum.Pacs.getKey())) {
+            pushDTO.setPacsMap(pacsMap);
+        } else if (featureTypeSet.contains(QuestionTypeEnum.Disease.getKey())) {
+            pushDTO.setDisMap(disMap);
+        }
+        //症状(主诉 type=1;现病史 type=2) 返回 tagName+填写单
+        else if (featureTypeSet.contains(QuestionTypeEnum.Mainsuit.getKey()) || featureTypeSet.contains(QuestionTypeEnum.Symptom.getKey())) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
-            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("tag_name", symptomMap.keySet()).eq("type", "2");
+            questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    in("tag_name", symptomMap.keySet()).
+                    eq("type", QuestionTypeEnum.Symptom.getKey());
             List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
             Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
             for (Map.Entry<String, Object> entry : symptomMap.entrySet()) {
-                entry.setValue(questionInfoMap.get(entry.getKey()).getId());
+                if (questionInfoMap.get(entry.getKey()) != null) {
+                    QuestionVO questionVO = new QuestionVO();
+                    questionVO.setAge(pushVO.getAge());
+                    questionVO.setSexType(pushVO.getSex());
+                    questionVO.setId(questionInfoMap.get(entry.getKey()).getId());
+                    entry.setValue(questionFacade.getById(questionVO));
+                }
             }
             pushDTO.setSymptomMap(symptomMap);
         }
-
-        pushDTO.setDisMap(disMap);
-        pushDTO.setPacsMap(pacsMap);
-        pushDTO.setLabMap(labMap);
-
         //查体 返回模板
-        if (featureTypeSet.contains("4") && dis != null && dis.size() > 0) {
+        else if (featureTypeSet.contains(QuestionTypeEnum.Vital.getKey()) && dis != null && dis.size() > 0) {
             String deptName = dis.get(0).getExtraProperty();
             QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
-            deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("name", deptName);
+            deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    eq("name", deptName);
             DeptInfo deptInfo = deptInfoFacade.getOne(deptInfoQueryWrapper);
             if (deptInfo == null) {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS, "科室信息不存在");
             }
 
             QueryWrapper<DeptVital> deptVitalQueryWrapper = new QueryWrapper<>();
-            deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("dept_id", deptInfo.getId());
+            deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    eq("dept_id", deptInfo.getId());
             List<DeptVital> deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
             if (deptVitalList.size() > 0) {
                 Map<Long, DeptVital> deptVitalMap = EntityUtil.makeEntityMap(deptVitalList, "vitalId");
                 //排序
                 QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
-                vitalOrderQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("question_id", deptVitalMap.keySet()).orderByAsc("order_no");
+                vitalOrderQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                        in("question_id", deptVitalMap.keySet()).
+                        orderByAsc("order_no");
                 List<VitalOrder> vitalOrderList = vitalOrderFacade.list(vitalOrderQueryWrapper);
-                Map<Long, VitalOrder> vitalOrderMap = EntityUtil.makeEntityMap(vitalOrderList, "id");
+                Map<Long, VitalOrder> vitalOrderMap = EntityUtil.makeEntityMap(vitalOrderList, "question_id");
                 //标签列表
-                QueryWrapper<QuestionInfo> vitalQueryWrapper = new QueryWrapper<>();
-                vitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).in("id", deptVitalMap.keySet());
+                /*QueryWrapper<QuestionInfo> vitalQueryWrapper = new QueryWrapper<>();
+                vitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                        in("id", deptVitalMap.keySet());
                 List<QuestionInfo> vitalList = questionFacade.list(vitalQueryWrapper);
-                Map<Long, QuestionInfo> vitalQuestionMap = EntityUtil.makeEntityMap(vitalList, "id");
+                Map<Long, QuestionInfo> vitalQuestionMap = EntityUtil.makeEntityMap(vitalList, "id");*/
                 for (Map.Entry<Long, VitalOrder> entry : vitalOrderMap.entrySet()) {
-                    QuestionInfo vitalQuestion = vitalQuestionMap.get(entry.getKey());
-                    if (vitalQuestion != null) {
-                        vitalMap.put(vitalQuestion.getTagName(), vitalQuestion);
+                    QuestionVO questionVO = new QuestionVO();
+                    questionVO.setAge(pushVO.getAge());
+                    questionVO.setSexType(pushVO.getSex());
+                    questionVO.setId(entry.getKey());
+                    QuestionDTO questionDTO = questionFacade.getById(questionVO);
+                    //QuestionInfo vitalQuestion = vitalQuestionMap.get(entry.getKey());
+                    if (questionDTO != null) {
+                        vitalMap.put(questionDTO.getTagName(), questionDTO);
                     }
                 }
                 pushDTO.setVitalMap(vitalMap);
@@ -154,6 +177,7 @@ public class PushFacade {
 
     /**
      * 将list 转换成 map
+     *
      * @param list
      * @return
      */
@@ -164,4 +188,4 @@ public class PushFacade {
         }
         return map;
     }
-}
+}

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

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.TranFieldInfoServiceImpl;
+import com.diagbot.vo.TranFieldInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/21 14:13
+ */
+@Component
+public class TranFieldInfoFacade extends TranFieldInfoServiceImpl {
+
+
+    /**
+     * 根据uuid获取相关信息
+     * @param info
+     * @return
+     */
+    public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(TranFieldInfoVO info){
+        List<TranFieldInfoDTO> tranFieldInfoDTOList = this.getInfosByUuid(info);
+        if(tranFieldInfoDTOList == null || tranFieldInfoDTOList.size() == 0){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS,
+                    "获取信息失败");
+        }
+        return RespDTO.onSuc(tranFieldInfoDTOList);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.mapper;
+
+import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.entity.TranFieldInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.TranFieldInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字段对应表 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+public interface TranFieldInfoMapper extends BaseMapper<TranFieldInfo> {
+
+    public List<TranFieldInfoDTO> getInfosByUuid(TranFieldInfoVO tranFieldInfoVO);
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.entity.TranFieldInfo;
+import com.diagbot.vo.TranFieldInfoVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字段对应表 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+public interface TranFieldInfoService extends IService<TranFieldInfo> {
+
+    public List<TranFieldInfoDTO> getInfosByUuid(TranFieldInfoVO tranFieldInfoVO);
+}

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

@@ -0,0 +1,28 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.entity.TranFieldInfo;
+import com.diagbot.mapper.TranFieldInfoMapper;
+import com.diagbot.service.TranFieldInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.TranFieldInfoVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字段对应表 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+@Service
+public class TranFieldInfoServiceImpl extends ServiceImpl<TranFieldInfoMapper, TranFieldInfo> implements TranFieldInfoService {
+
+    @Override
+    public List<TranFieldInfoDTO> getInfosByUuid(TranFieldInfoVO tranFieldInfoVO) {
+        return baseMapper.getInfosByUuid(tranFieldInfoVO);
+    }
+}

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

@@ -13,8 +13,9 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class IntroduceByQuestionVO {
-    @NotNull(message = "请输入标签id")
     private Long questionId;
+    private String tagName;
     @NotNull(message = "请输入标签类型")
     private Integer type;
+
 }

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

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/11/21 14:08
+ */
+@Getter
+@Setter
+public class TranFieldInfoVO {
+
+    @NotNull(message = "请输入医院编码")
+    private String uuid;
+}

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

@@ -38,7 +38,7 @@ public class DeptInfoController {
                     "hospitalCode:医院编号，必填<br>")
     @PostMapping("/getPatientInfo")
     @SysLogger("getPatientInfo")
-    public RespDTO<List<DeptInfoDTO>> getPatientInfo(@Valid @RequestBody DeptInfoVO deptInfoVO) {
+    public RespDTO<List<DeptInfoDTO>> getDeptInfo(@Valid @RequestBody DeptInfoVO deptInfoVO) {
         return deptInfoFacade.getDeptInfo(deptInfoVO);
     }
 }

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

@@ -39,7 +39,7 @@ public class DoctorInfoController {
                     "doctorCode: 医生编号，必填<br>")
     @PostMapping("/getPatientInfo")
     @SysLogger("getPatientInfo")
-    public RespDTO<List<DoctorInfoDTO>> getPatientInfo(@Valid @RequestBody DoctorInfoVO doctorInfoVo) {
+    public RespDTO<List<DoctorInfoDTO>> getDoctorInfo(@Valid @RequestBody DoctorInfoVO doctorInfoVo) {
         return doctorInfoFacade.getDoctorInfo(doctorInfoVo);
     }
 }

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

@@ -32,12 +32,21 @@ public class IntroduceInfoController {
     @Autowired
     IntroduceInfoFacade introduceInfoFacade;
 
-    @ApiOperation(value = "根据标签获取提示信息[by:zhaops]",
+    @ApiOperation(value = "根据标签id获取提示信息[by:zhaops]",
             notes = "questionId: 标签id，必填<br>" +
                     "type：标签类型，必填")
-    @PostMapping("/getByQuestion")
-    public RespDTO<IntroduceDTO> getByQuestion(@RequestBody @Valid IntroduceByQuestionVO introduceByQuestionVO) {
-        IntroduceDTO introduceDTO = introduceInfoFacade.getByQuestion(introduceByQuestionVO);
+    @PostMapping("/getByQuestionId")
+    public RespDTO<IntroduceDTO> getByQuestionId(@RequestBody @Valid IntroduceByQuestionVO introduceByQuestionVO) {
+        IntroduceDTO introduceDTO = introduceInfoFacade.getByQuestionId(introduceByQuestionVO);
+        return RespDTO.onSuc(introduceDTO);
+    }
+
+    @ApiOperation(value = "根据标签名称获取提示信息[by:zhaops]",
+            notes = "tagName: 标签名称，必填<br>" +
+                    "type：标签类型，必填")
+    @PostMapping("/getByQuestionName")
+    public RespDTO<IntroduceDTO> getByQuestionName(@RequestBody @Valid IntroduceByQuestionVO introduceByQuestionVO) {
+        IntroduceDTO introduceDTO = introduceInfoFacade.getByQuestionName(introduceByQuestionVO);
         return RespDTO.onSuc(introduceDTO);
     }
 

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

@@ -0,0 +1,42 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TranFieldInfoDTO;
+import com.diagbot.facade.TranFieldInfoFacade;
+import com.diagbot.vo.TranFieldInfoVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 字段对应表 前端控制器
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+@RestController
+@RequestMapping("/tranFieldInfo")
+@Api(value = "字段对应信息API", tags = { "字段对应信息API" })
+public class TranFieldInfoController {
+    @Autowired
+    TranFieldInfoFacade tranFieldInfoFacade;
+
+    @ApiOperation(value = "患者信息——查询[by:wangyu]",
+            notes = "uuid:医院编号，必填<br>")
+    @PostMapping("/getPatientInfo")
+    @SysLogger("getPatientInfo")
+    public RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@Valid @RequestBody TranFieldInfoVO tranFieldInfoVO) {
+        return tranFieldInfoFacade.getInfoByUuid(tranFieldInfoVO);
+    }
+}

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.TranFieldInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.TranFieldInfo">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="uuid" property="uuid" />
+        <result column="icss_field" property="icssField" />
+        <result column="his_field" property="hisField" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <select id="getInfosByUuid" resultType="com.diagbot.dto.TranFieldInfoDTO">
+        SELECT * FROM `tran_field_info` t where t.status = '1' and FIND_IN_SET(#{uuid},uuid)
+    </select>
+</mapper>

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

@@ -10,7 +10,6 @@ import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.IntroducePageVO;
 import com.diagbot.vo.IntroduceVO;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -49,15 +48,16 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         introduceInfo.setRemark(introduceVO.getRemark());
 
         //明细信息不更新，每次都删除重新插入
-        //删除已有明细
+        //删除已有明细，物理删除
         if (!(introduceInfo.getId() == null)) {
             UpdateWrapper<IntroduceDetail> detailUpdateWrapper = new UpdateWrapper<>();
             detailUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                    eq("introduce_id", introduceInfo.getId()).
-                    set("is_deleted", IsDeleteEnum.Y.getKey()).
-                    set("gmt_modified", new Date()).
-                    set("modifier", UserUtils.getCurrentPrincipleID());
-            introduceDetailFacade.update(new IntroduceDetail(), detailUpdateWrapper);
+                    eq("introduce_id", introduceInfo.getId());
+            introduceDetailFacade.remove(detailUpdateWrapper);
+        }
+        //新增明细，清空id
+        for (IntroduceDetail detail : introduceVO.getDetailList()) {
+            detail.setId(null);
         }
         //插入新的明细记录
         introduceDetailFacade.saveOrUpdateBatch(introduceVO.getDetailList());

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

@@ -36,7 +36,7 @@ public class IntroduceInfoController {
     IntroduceInfoFacade introduceInfoFacade;
 
     @ApiOperation(value = "保存提示信息[by:zhaops]",
-            notes = "id: 修改时带id,新增时未空<br>" +
+            notes = "id: 修改时带id,新增时为空<br>" +
                     "name: 名称，必填<br>" +
                     "remark：备注<br>" +
                     "detailList:提示信息明细列表")