Merge remote-tracking branch 'origin/debug' into debug

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/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);
@@ -423,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/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/LisExcelResController.java

@@ -1,23 +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

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");

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/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

@@ -138,7 +138,7 @@
             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