Merge branch 'dev/icss' into dev/tran

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

@@ -8,7 +8,7 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -8,7 +8,7 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -8,7 +8,7 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -8,7 +8,7 @@ spring:
       driverClassName: com.mysql.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

icss-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -1,5 +1,7 @@
 package com.diagbot.client.bean;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -17,7 +19,7 @@ public class ResponseData {
     private List<FeatureRate> labs = new ArrayList<>(10);
     private List<FeatureRate> pacs = new ArrayList<>(10);
     private List<FeatureRate> history=new ArrayList<>(10);
-    private Map<String,String> treat;
+    private Map<String, JSONObject> treat;
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
 
@@ -78,11 +80,11 @@ public class ResponseData {
         this.history = history;
     }
 
-    public Map<String, String> getTreat() {
+    public Map<String, JSONObject> getTreat() {
         return treat;
     }
 
-    public void setTreat(Map<String, String> treat) {
+    public void setTreat(Map<String, JSONObject> treat) {
         this.treat = treat;
     }
 

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

@@ -0,0 +1,30 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/01/14 45:00
+ */
+@ApiModel(value="获取最近一次其他史信息接口出参")
+@Getter
+@Setter
+public class GetLastOtherDTO {
+	
+	/**
+	 * 内容JSON字符串
+	 */
+	@ApiModelProperty(value="内容JSON字符串")
+	private String dataJson;
+	
+	/**
+	 * 问诊明细中的其他史
+	 */
+	@ApiModelProperty(value="问诊明细中的其他史")
+	private String otherStr;
+	
+}

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

@@ -131,6 +131,13 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="系统时间")
 	private Date systemTime;
 	
+	/**
+     * 出生日期
+     */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value="出生日期")
+    private Date birthday;
+	
 	/**
      * 门诊号
      */

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

@@ -16,4 +16,5 @@ import java.util.List;
 @Setter
 public class IntroduceDTO extends IntroduceInfo {
     private List<IntroduceDetail> introduceDetailList;
+    private String tagName;
 }

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

@@ -8,13 +8,13 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
@@ -24,6 +24,7 @@ import com.diagbot.entity.HospitalInfo;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.SexTypeEnum;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -153,7 +154,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param getLastOtherVO
      * @return
      */
-    public String getLastOther(GetLastOtherVO getLastOtherVO) {
+    public GetLastOtherDTO getLastOther(GetLastOtherVO getLastOtherVO) {
+    	GetLastOtherDTO getLastOtherDTO = new GetLastOtherDTO();
+    	
         HospitalInfo hospitalInfo = hospitalInfoFacade.getHospitalByCode(getLastOtherVO.getHospitalCode());
         PatientInfo patientInfo = patientInfoFacade.getPatientByCode(getLastOtherVO.getHospitalCode(), getLastOtherVO.getPatientCode());
 
@@ -164,10 +167,17 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         InquiryInfo inquiryInfo = baseMapper.getPatientLast(map);
 
         if (inquiryInfo != null) {
-        	return inquiryInfo.getDataJson();
-        }else{
-        	return null;
+        	getLastOtherDTO.setDataJson(inquiryInfo.getDataJson());
+        	
+        	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+            inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
+            inquiryDetailQe.eq("type", 3);
+            InquiryDetail inquiryDetail = inquiryDetailFacade.getOne(inquiryDetailQe);
+            if(inquiryDetail!=null){
+            	getLastOtherDTO.setOtherStr(inquiryDetail.getContent());
+            }
         }
+        return getLastOtherDTO;
     }
 
     /**

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

@@ -40,9 +40,14 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      * @return
      */
     public IntroduceDTO getByQuestionId(IntroduceByQuestionVO introduceByQuestionVO) {
-        if (introduceByQuestionVO.getQuestionId() == null) {
+        Long questionId = introduceByQuestionVO.getQuestionId();
+        if (questionId == null) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入标签id");
         }
+        QuestionInfo questionInfo = questionFacade.getById(questionId);
+        if (questionInfo == null) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "未找到标签");
+        }
         QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
         introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("question_id", introduceByQuestionVO.getQuestionId()).
@@ -53,6 +58,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         }
 
         IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
+        introduceDTO.setTagName(questionInfo.getTagName());
         return introduceDTO;
     }
 
@@ -85,6 +91,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         }
 
         IntroduceDTO introduceDTO = this.getRecordByIdAndPosition(introduceMap.getIntroduceId(), introduceByQuestionVO.getPosition());
+        introduceDTO.setTagName(questionInfo.getTagName());
         return introduceDTO;
     }
 

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

@@ -49,6 +49,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
         GetTopPatientInfoDTO getTopPatientInfoDTO = baseMapper.getTopPatientInfo(getTopPatientInfoVO);
         getTopPatientInfoDTO.setSystemTime(DateUtil.now());
         getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
+        getTopPatientInfoDTO.setPatientAge(DateUtil.yearCompare(getTopPatientInfoDTO.getBirthday(), DateUtil.now()));
 
         QueryWrapper<DeptInfo> deptInfoQ = new QueryWrapper<>();
         deptInfoQ.eq("is_deleted", IsDeleteEnum.N.getKey())

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.HighRiskServiceClient;
@@ -59,8 +60,6 @@ public class PushFacade {
     @Autowired
     private DeptVitalFacade deptVitalFacade;
     @Autowired
-    private VitalOrderFacade vitalOrderFacade;
-    @Autowired
     private TreatmentFacade treatmentFacade;
     @Autowired
     private HighRiskServiceClient highRiskServiceClient;
@@ -145,7 +144,7 @@ public class PushFacade {
         List<FeatureRate> pacs = data.getPacs();
         List<FeatureRate> labs = data.getLabs();
         List<FeatureRate> other = data.getHistory();
-        Map<String, String> treat = data.getTreat();
+        Map<String, JSONObject> treat = data.getTreat();
 
         Map<String, Object> symptomMap = list2Map(symptom);
         Map<String, Object> labMap = list2Map(labs);
@@ -409,6 +408,7 @@ public class PushFacade {
         if (deptInfo == null) {
             //科室信息不存在时推全科模板
             deptName = "全科";
+            deptInfoQueryWrapper = new QueryWrapper<>();
             deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     eq("name", deptName);
             deptInfo = deptInfoFacade.getOne(deptInfoQueryWrapper);
@@ -422,6 +422,15 @@ public class PushFacade {
                 eq("dept_id", deptInfo.getId()).
                 orderByAsc("order_no");
         List<DeptVital> deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
+        //科室模板为空时，取全科模板
+        if(deptVitalList.size()==0) {
+            deptVitalQueryWrapper = new QueryWrapper<>();
+            String sql = "select id from icss_dept_info where name='全科' and is_deleted='N'";
+            deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    inSql("dept_id", sql).
+                    orderByAsc("order_no");
+            deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
+        }
         //标签列表
         for (DeptVital deptVital : deptVitalList) {
             QuestionVO questionVO = new QuestionVO();

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

@@ -131,9 +131,10 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      *
      * @return
      */
-    public Map<Long,QuestionInfo> getQuestionInfos(){
+    public Map<Long,QuestionInfo> getQuestionInfos(List<Long> questionIdList){
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+            .in("id",questionIdList);
         List<QuestionInfo> questionInfoList = this.list(questionInfoQueryWrapper);
         Map<Long,QuestionInfo> map = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
         return map;

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -22,6 +23,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 
     @Autowired
     QuestionFacade questionFacade;
+
     /**
      * 获取标签信息
      *
@@ -29,14 +31,17 @@ public class RetrievalFacade extends RetrievalServiceImpl {
      * @return
      */
     public List<RetrievalDTO> getTagInfos(@Valid @RequestBody RetrievalVO retrievalVO) {
-        if(retrievalVO.getInputStr() == null || retrievalVO.getInputStr() == ""){
+        if (retrievalVO.getInputStr() == null || retrievalVO.getInputStr() == "") {
             retrievalVO.setInputStr(" ");
         }
         //获取同义词标签信息
         List<RetrievalDTO> data = this.getSymptopInfo(retrievalVO);
+        List<Long> questionIdList = data.stream()
+                .map(r -> r.getQuestionId())
+                .collect(Collectors.toList());
         //将标签名放入实体
-        Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos();
-        for (RetrievalDTO retrievalDTO:data) {
+        Map<Long, QuestionInfo> map = questionFacade.getQuestionInfos(questionIdList);
+        for (RetrievalDTO retrievalDTO : data) {
             retrievalDTO.setName(map.get(retrievalDTO.getQuestionId()).getTagName());
         }
         return data;

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

@@ -1,5 +1,7 @@
 package com.diagbot.facade;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.TreatServiceClient;
 import com.diagbot.client.bean.Medicition;
@@ -46,12 +48,15 @@ public class TreatmentFacade {
      * @param
      * @return
      */
-    public Map<String, Object> getTreatment(Map<String, String> treatmentMap, Long diseaseId) {
+    public Map<String, Object> getTreatment(Map<String, JSONObject> treatmentMap, Long diseaseId) {
         Map<String, Object> retMap = new LinkedHashMap<>();
         QuestionInfo disease = questionFacade.getById(diseaseId);
         if (disease == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "诊断不存在");
         }
+        if (treatmentMap.size() == 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "未找到治疗方案");
+        }
         if (!treatmentMap.containsKey(disease.getTagName())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "诊断名称和id不匹配");
         }
@@ -65,12 +70,17 @@ public class TreatmentFacade {
         retMap.put("surgeryTreatment", surgeryTreatmentDetailList.size() > 0 ? surgeryTreatmentDetailList.get(0).getContent() : "");
 
         //获取知识图谱治疗方案
-        String treatment = treatmentMap.get(disease.getTagName());
-        if (StringUtil.isBlank(treatment)) {
+        JSONObject diseaseJson = treatmentMap.get(disease.getTagName());
+        if (diseaseJson == null || diseaseJson.isEmpty()) {
+            return retMap;
+        }
+
+        JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
+        if (treatmentJson == null || treatmentJson.isEmpty()) {
             return retMap;
         }
 
-        List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatment, "treatment", MedicitionClass.class);
+        List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "treatment", MedicitionClass.class);
 
         List<String> classNameList = drugsList.stream().map(drugs -> drugs.getDrugsName()).collect(Collectors.toList());
         List<QuestionInfo> drugClassList = getTopQuestionList(classNameList, QuestionTypeEnum.DrugClass.getKey());

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
@@ -59,7 +60,7 @@ public class InquiryInfoController {
     @ApiOperation(value = "获取最近一次其他史信息[by:rengb]")
     @PostMapping("/getLastOther")
     @SysLogger("getLastOther")
-    public RespDTO<String> getLastOther(@Valid @RequestBody GetLastOtherVO getLastOtherVO) {
+    public RespDTO<GetLastOtherDTO> getLastOther(@Valid @RequestBody GetLastOtherVO getLastOtherVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getLastOther(getLastOtherVO));
     }
 

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

@@ -1,22 +1,18 @@
 package com.diagbot.web;
 
-import javax.servlet.http.HttpServletRequest;
-
+import com.diagbot.facade.LisExcelResFacade;
+import com.diagbot.util.GsonUtil;
+import com.diagbot.vo.LisHospitalCodeVO;
+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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.LisExcelResFacade;
-import com.diagbot.vo.LisHospitalCodeVO;
-import com.diagbot.vo.LitAssayVO;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author wangfeng
@@ -33,8 +29,8 @@ public class LisExcelResController {
     LisExcelResFacade lisExcelResFacade;
 
     @ApiOperation(value = "导入化验数据:[by:wangfeng]", notes = "导入化验数据")
-    @PostMapping("/lisExcelAnalysis")
-    public RespDTO<LitAssayVO> lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
-        return lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO.getHospitalCode(), request);
+    @PostMapping(value = "/lisExcelAnalysis", produces="text/html;charset=utf-8")
+    public String lisExcelAnalysis(@RequestParam("uploadfile") MultipartFile file, LisHospitalCodeVO lisHospitalCodeVO, HttpServletRequest request) {
+        return GsonUtil.toJson(lisExcelResFacade.lisExcelAnalysis(file,lisHospitalCodeVO.getHospitalCode(), request));
     }
 }

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

@@ -35,7 +35,7 @@ public class PushController {
 
     @ApiOperation(value = "推理接口(半结构化)[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
@@ -51,7 +51,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案(必填),String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>" +
                     "diseaeId：取治疗方案的诊断,Long<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
@@ -61,7 +61,7 @@ public class PushController {
 
     @ApiOperation(value = "推理接口(文本模式)[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体,String<br>" +
@@ -78,7 +78,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案(必填),String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>" +
                     "diseaeId：取治疗方案的诊断,Long<br>")
     @PostMapping("/pushText")
     @SysLogger("pushText")
@@ -88,7 +88,7 @@ public class PushController {
 
     @ApiOperation(value = "推理接口（大数据结果）[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
                     "symptom：症状,String<br>" +
                     "other：其它史,String<br>" +
                     "vital：查体<br>" +
@@ -105,7 +105,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "dis：诊断<br>" +
-                    "featureType：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案(必填)<br>")
+                    "featureType(必填)：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>")
     @PostMapping("/pushAI")
     @SysLogger("pushAI")
     public RespDTO<ResponseData> pushAI(@RequestBody @Valid PushVO pushVO) {
@@ -114,9 +114,9 @@ public class PushController {
 
     @ApiOperation(value = "推理接口(快易检）[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
-                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女<br>" +
                     "lisKYJVOList：化验项列表(必填)<br>" +
-                    "featureType：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案(必填),String<br>")
+                    "featureType(必填)：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>")
     @PostMapping("/pushKYJ")
     @SysLogger("pushKYJ")
     public RespDTO<PushKYJDTO> pushKYJ(@RequestBody @Valid PushKYJVO pushKYJVO) {

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

@@ -55,7 +55,7 @@
 		d.`name` as patientName,
 		case when d.sex=1 then '男' when d.sex=2 then '女' else '未知' end as patientSex,
 		d.id_no as patientIdNo,
-		ROUND(DATEDIFF(CURDATE(), d.birthday)/365.2422) as patientAge
+		d.birthday as birthday
 		FROM tran_hospital_info a LEFT JOIN tran_hospital_dept b 
 		ON a.`code`=b.hospital_code and b.`status`=1 and b.is_deleted='N' and b.`code`=#{hospitalDeptCode} 	
 		LEFT JOIN tran_doctor_info c 

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

@@ -131,8 +131,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      */
     public CommonParam initCommonParam() {
         CommonParam param = new CommonParam();
-        //String person = UserUtils.getCurrentPrincipleID(); //TODO person
-        String person = "1";
+        String person = UserUtils.getCurrentPrincipleID();
         param.setNow(DateUtil.now());
         param.setPerson(person);
         param.setSaveOrUpdate("save");
@@ -488,6 +487,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("controlType", questionIndexVO.getControlType());
         paramMap.put("notIds", questionIndexVO.getNotIds());
         paramMap.put("tagType", questionIndexVO.getTagType());
+        paramMap.put("existName", questionIndexVO.getExistName());
         return this.index(paramMap);
     }
 

icssman-service/src/main/java/com/diagbot/vo/DeleteModuleVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/1/28 15:55
+ */
+@Getter
+@Setter
+public class DeleteModuleVO {
+    //要删除的id
+    private String ids;
+}

icssman-service/src/main/java/com/diagbot/vo/DeleteQuestionVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: ztg
+ * @time: 2019/1/28 15:45
+ */
+@Getter
+@Setter
+public class DeleteQuestionVO {
+    private String ids;
+}

icssman-service/src/main/java/com/diagbot/vo/QuestionIndexVO.java

@@ -17,7 +17,8 @@ public class QuestionIndexVO {
     private Integer sexType;
     private Integer age;
     private Integer type;
-    private Integer controlType;
+    private List<Integer> controlType;
     private List<Integer> tagType;
     private List<Long> notIds;
+    private String existName; //是否重复
 }

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

@@ -11,6 +11,7 @@ import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ModuleInfoFacade;
 import com.diagbot.vo.AddModuleInfoVO;
+import com.diagbot.vo.DeleteModuleVO;
 import com.diagbot.vo.GetModuleDetailInfoVO;
 import com.diagbot.vo.GetModuleInfoOneVO;
 import com.diagbot.vo.GetModuleInfoVO;
@@ -81,8 +82,8 @@ public class ModuleInfoController {
     @PostMapping("/delete")
     @SysLogger("delete")
     @Transactional
-    public RespDTO<Boolean> delete(String ids) {
-        moduleInfoFacade.deleteByIdsFac(ids);
+    public RespDTO<Boolean> delete(@RequestBody DeleteModuleVO deleteModuleVO) {
+        moduleInfoFacade.deleteByIdsFac(deleteModuleVO.getIds());
         return RespDTO.onSuc(true);
     }
 

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
+import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionIndexVO;
 import com.diagbot.vo.QuestionPageVO;
@@ -84,13 +85,13 @@ public class QuestionInfoController {
     }
 
 
-    @ApiOperation(value = "标签删除(测试阶段，别乱删)[by:zhoutg]",
+    @ApiOperation(value = "标签删除[by:zhoutg]",
             notes = "")
     @PostMapping("/delete")
     @SysLogger("delete")
     @Transactional
-    public RespDTO<Boolean> delete(String ids) {
-        questionFacade.deleteByIdsFac(ids);
+    public RespDTO<Boolean> delete(@RequestBody DeleteQuestionVO deleteQuestionVO) {
+        questionFacade.deleteByIdsFac(deleteQuestionVO.getIds());
         return RespDTO.onSuc(true);
     }
 

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -49,6 +49,9 @@
         <if test="tagName != null and tagName != ''">
             and tag_name like concat("%", #{tagName}, "%")
         </if>
+        <if test="existName != null and existName != ''">
+            and tag_name = #{existName}
+        </if>
         <if test="sexType != null and sexType != ''">
             and sex_type in (3, #{sexType})
         </if>
@@ -59,8 +62,11 @@
         <if test="type != null and type != ''">
             and type = #{type}
         </if>
-        <if test="controlType != null and controlType != ''">
-            and control_type = #{controlType}
+        <if test="controlType != null and controlType.size() > 0">
+            and control_type in
+            <foreach  collection="controlType" item="controlType" open="("  separator=","  close=")">
+                #{controlType}
+            </foreach>
         </if>
         <if test="tagType != null and tagType.size() > 0">
             and tag_type in
@@ -128,11 +134,11 @@
 
     <select id="getList" resultType="com.diagbot.dto.QuestionPageDTO">
         SELECT a.* FROM `icss_question_info` a WHERE a.is_deleted = 'N'
-        <if test="type != null">
+        <if test="type != null and type != ''">
             AND a.type = #{type}
         </if>
         <if test="tagName != null and tagName != ''">
-            AND a.name like concat ('%', #{tagName}, '%')
+            AND a.tag_name like concat ('%', #{tagName}, '%')
         </if>
         <if test="tagTypeList != null and tagTypeList.size() > 0 ">
             and a.tag_type in
@@ -140,7 +146,7 @@
                 #{tagType}
             </foreach>
         </if>
-        order by a.gmt_create desc
+        order by a.gmt_modified desc
 
     </select>
 

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

@@ -1449,7 +1449,7 @@ public class UserFacade extends UserServiceImpl {
         Map<String, String> map = new HashMap<>();
         if (ListUtil.isNotEmpty(userList)){
             for (User user: userList){
-                map.put(user.getId().toString(), user.getUsername());
+                map.put(user.getId().toString(), user.getLinkman());
             }
         }
         return map;