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

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

@@ -133,7 +133,7 @@ public class PushFacade {
                 if (StringUtil.isNotBlank(lisResultVO.getName())) {
                     if (StringUtil.isNotBlank(lisResultVO.getDetailName())) {
                         Map<String, String> detailMap = lisConfigMap.get(lisResultVO.getName());
-                        if (StringUtil.isNotBlank(detailMap.get(lisResultVO.getDetailName()))) {
+                        if (null != detailMap && detailMap.size() > 0 && StringUtil.isNotBlank(detailMap.get(lisResultVO.getDetailName()))) {
                             lisResultVO.setUniqueName(detailMap.get(lisResultVO.getDetailName()));
                         }
                     } else {
@@ -141,9 +141,9 @@ public class PushFacade {
                     }
                 }
             }
+            List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
+            searchData.setLisArr(lisResultList);
         }
-        List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
-        searchData.setLisArr(lisResultList);
 
         return searchData;
     }

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

@@ -136,7 +136,7 @@
         `icss_question_info` a
         WHERE
         a.is_deleted = 'N'
-        AND a.type = #{type} AND a.tag_type != 8
+        AND a.type = #{type} AND a.tag_type != 8 and a.control_type != 99
         <if test="moduleId != null and moduleId != ''">
             AND a.id NOT IN (
             SELECT

knowledgeman-service/src/main/java/com/diagbot/entity/Medical.java

@@ -19,6 +19,11 @@ public class Medical implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
     /**
      * 术语概念id
      */
@@ -94,11 +99,6 @@ public class Medical implements Serializable {
      */
     private String note;
 
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
     public Integer getId() {
         return id;
     }
@@ -106,6 +106,13 @@ public class Medical implements Serializable {
     public void setId(Integer id) {
         this.id = id;
     }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
     public Integer getConceptId() {
         return conceptId;
     }
@@ -212,18 +219,11 @@ public class Medical implements Serializable {
         this.note = note;
     }
 
-    public String getIs_deleted() {
-        return isDeleted;
-    }
-
-    public void setIs_deleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
     @Override
     public String toString() {
         return "Medical{" +
         "id=" + id +
+        ", isDeleted=" + isDeleted +
         ", conceptId=" + conceptId +
         ", name=" + name +
         ", stdName=" + stdName +
@@ -239,7 +239,6 @@ public class Medical implements Serializable {
         ", dept=" + dept +
         ", code=" + code +
         ", note=" + note +
-        ", isDeleted=" + isDeleted +
         "}";
     }
 }

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -146,21 +146,27 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
 
 
-        query = new QueryWrapper<>();
-        query.eq("name", amendTermVo.getNewterm());
-        query.eq("type", amendTermVo.getNewtype());
-        concept = getOne(query);
+//        QueryWrapper<LibraryInfo> queryinfo = new QueryWrapper<>();
+//        queryinfo.eq("name", amendTermVo.getNewterm());
+//        queryinfo.eq("type", amendTermVo.getNewtype());
+//        LibraryInfo libraryInfonew = libraryinfoFacade.getOne(queryinfo);
 
         BeanUtils.copyProperties(concept, conceptDTO);
+//        if (libraryInfonew != null) {
+            conceptDTO.setId(libraryInfo.getConceptId());
+            conceptDTO.setLibId(libraryInfo.getId().intValue());
+//        }
 
         QueryWrapper<LibraryInfo> conceptquery = new QueryWrapper<>();
         conceptquery = new QueryWrapper<>();
-        conceptquery.eq("concept_id", concept.getId());
+        conceptquery.eq("concept_id", libraryInfo.getConceptId());
         conceptquery.isNull("is_concept");
         List<LibraryInfo> libraryInfos = libraryinfoFacade.list(conceptquery);
 
         conceptDTO.setLibraryInfo(libraryInfos);
 
+        medicalFacade.upsertMedicalInfo(amendTermVo);
+
         return conceptDTO;
     }
 

knowledgeman-service/src/main/java/com/diagbot/facade/LibraryInfoFacade.java

@@ -57,7 +57,7 @@ public class LibraryInfoFacade extends LibraryInfoServiceImpl {
     public LibraryInfo upsertLibraryInfo(AmendTermVo amendTermVo) {
 
         String oldterm = amendTermVo.getOldterm().trim();
-        String oldtype = amendTermVo.getOldtype().trim();
+        String oldtype = (amendTermVo.getOldtype()!=null)?amendTermVo.getOldtype().trim():"";
         String newterm = amendTermVo.getNewterm().trim();
         String newtype = amendTermVo.getNewtype().trim();
         String concept = amendTermVo.getConcept().trim();

knowledgeman-service/src/main/java/com/diagbot/facade/MedicalFacade.java

@@ -86,7 +86,6 @@ public class MedicalFacade extends MedicalServiceImpl {
     public ConceptDTO upsertMedicalInfo(AmendTermVo amendTermVo) {
         ConceptDTO conceptDTO = new ConceptDTO();
 
-//        Map<String, Object> map;
         Medical medical;
         List<Medical> medicals;
 
@@ -104,11 +103,6 @@ public class MedicalFacade extends MedicalServiceImpl {
 
             for (int i=0; i<amendTermVo.getMedicalInfo().size(); i++) {
                 medical = amendTermVo.getMedicalInfo().get(i);
-//                medical = amendTermVo.getMedicalInfo();
-
-//                map = new HashMap<>();
-//                map.put("name", amendTermVo.getNewterm());
-//                medicals = getMedicalInfo(map);
 
                 QueryWrapper<Medical> medquery = new QueryWrapper<>();
                 medquery.eq("name", amendTermVo.getNewterm());
@@ -118,15 +112,15 @@ public class MedicalFacade extends MedicalServiceImpl {
                     Medical exist_medical = medicals.get(0);
                     medical.setId(exist_medical.getId());
                 }
-                else {
-                    medical.setConceptId(libraryInfo.getConceptId());
-                }
 
+                medical.setConceptId(libraryInfo.getConceptId());
+
+                if (medical.getIsDeleted() == null) {
+                    medical.setIsDeleted("N");
+                }
 
                 this.saveOrUpdate(medical);
 
-//                amendTermVo.setMedicalInfo(medical);
-//                amendTermVo.getMedicalInfo().set(i, medical);
                 conceptDTO.getMedicalInfo().add(medical);
             }
         }

knowledgeman-service/src/main/resources/mapper/MedicalMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Medical">
         <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
         <result column="concept_id" property="conceptId" />
         <result column="name" property="name" />
         <result column="std_name" property="stdName" />
@@ -20,7 +21,6 @@
         <result column="dept" property="dept" />
         <result column="code" property="code" />
         <result column="note" property="note" />
-        <result column="is_deleted" property="isDeleted" />
     </resultMap>