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

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

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.entity.BuriedSomeStatistical;
 import com.diagbot.service.impl.BuriedSomeStatisticalServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.BuriedSomeStatisticalVO;
 import com.diagbot.vo.Taggeds;
 import org.springframework.stereotype.Component;
@@ -25,26 +26,29 @@ public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImp
      * @return
      */
     public boolean saveBuriedSomeStatistical(BuriedSomeStatisticalVO buriedSomeStatisticalVO) {
-        List<BuriedSomeStatistical> buriedList = new ArrayList<BuriedSomeStatistical>();
-        List<Taggeds> taggeds = buriedSomeStatisticalVO.getTaggeds();
-        for (Taggeds taggedsNew : taggeds) {
-            BuriedSomeStatistical buriedData = new BuriedSomeStatistical();
-            buriedData.setCreator(buriedSomeStatisticalVO.getDoctorId().toString());
-            buriedData.setDoctorId(buriedSomeStatisticalVO.getDoctorId());
-            buriedData.setGmtCreate(DateUtil.now());
-            buriedData.setHospitalDeptId(buriedSomeStatisticalVO.getHospitalDeptId());
-            buriedData.setHospitalId(buriedSomeStatisticalVO.getHospitalId());
-            buriedData.setInquiryCode(buriedSomeStatisticalVO.getInquiryCode());
-            buriedData.setPatientId(buriedSomeStatisticalVO.getPatientId());
-            buriedData.setLabelId(taggedsNew.getLabelId());
-            buriedData.setLabelName(taggedsNew.getLabelName());
-            buriedData.setOperationNum(taggedsNew.getOperationNum());
-            buriedData.setOperationType(taggedsNew.getOperationType());
-            buriedData.setStatus(taggedsNew.getStatus());
-            buriedList.add(buriedData);
-        }
+        boolean res = false;
+        if (null != buriedSomeStatisticalVO
+                && ListUtil.isNotEmpty(buriedSomeStatisticalVO.getTaggeds())) {
+            List<BuriedSomeStatistical> buriedList = new ArrayList<BuriedSomeStatistical>();
+            for (Taggeds taggedsNew : buriedSomeStatisticalVO.getTaggeds()) {
+                BuriedSomeStatistical buriedData = new BuriedSomeStatistical();
+                buriedData.setCreator(buriedSomeStatisticalVO.getDoctorId().toString());
+                buriedData.setDoctorId(buriedSomeStatisticalVO.getDoctorId());
+                buriedData.setGmtCreate(DateUtil.now());
+                buriedData.setHospitalDeptId(buriedSomeStatisticalVO.getHospitalDeptId());
+                buriedData.setHospitalId(buriedSomeStatisticalVO.getHospitalId());
+                buriedData.setInquiryCode(buriedSomeStatisticalVO.getInquiryCode());
+                buriedData.setPatientId(buriedSomeStatisticalVO.getPatientId());
+                buriedData.setLabelId(taggedsNew.getLabelId());
+                buriedData.setLabelName(taggedsNew.getLabelName());
+                buriedData.setOperationNum(taggedsNew.getOperationNum());
+                buriedData.setOperationType(taggedsNew.getOperationType());
+                buriedData.setStatus(taggedsNew.getStatus());
+                buriedList.add(buriedData);
+            }
 
-        boolean res = insertCodeBatch(buriedList);
+            res = insertCodeBatch(buriedList);
+        }
         return res;
     }
 

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

@@ -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;
     }
@@ -216,9 +216,18 @@ public class PushFacade {
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Vital.getKey()))) {
             List<FeatureRate> vitals = data.getVitals();
             //没有推送信息时，默认取全科模板
-            String deptName = "全科";
+            String deptName = "";
             if (dis != null && dis.size() > 0) {
-                deptName = dis.get(0).getExtraProperty();
+                for (FeatureRate featureRate : dis) {
+                    if (StringUtil.isNotBlank(featureRate.getExtraProperty())) {
+                        deptName = featureRate.getExtraProperty();
+                        break;
+                    }
+                }
+                //deptName = dis.get(0).getExtraProperty();
+            }
+            if (StringUtil.isBlank(deptName)) {
+                deptName = "全科";
             }
             List<QuestionDTO> vitalDTO = getVitalModule(deptName, pushVO);
             pushDTO.setVital(vitalDTO);

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

@@ -19,11 +19,6 @@ public class Medical implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
     /**
      * 术语概念id
      */
@@ -99,6 +94,11 @@ public class Medical implements Serializable {
      */
     private String note;
 
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
     public Integer getId() {
         return id;
     }
@@ -106,13 +106,6 @@ 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;
     }
@@ -219,11 +212,18 @@ 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,6 +239,7 @@ public class Medical implements Serializable {
         ", dept=" + dept +
         ", code=" + code +
         ", note=" + note +
+        ", isDeleted=" + isDeleted +
         "}";
     }
 }

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

@@ -146,27 +146,21 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
 
 
-//        QueryWrapper<LibraryInfo> queryinfo = new QueryWrapper<>();
-//        queryinfo.eq("name", amendTermVo.getNewterm());
-//        queryinfo.eq("type", amendTermVo.getNewtype());
-//        LibraryInfo libraryInfonew = libraryinfoFacade.getOne(queryinfo);
+        query = new QueryWrapper<>();
+        query.eq("name", amendTermVo.getNewterm());
+        query.eq("type", amendTermVo.getNewtype());
+        concept = getOne(query);
 
         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", libraryInfo.getConceptId());
+        conceptquery.eq("concept_id", concept.getId());
         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()!=null)?amendTermVo.getOldtype().trim():"";
+        String oldtype = 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,6 +86,7 @@ public class MedicalFacade extends MedicalServiceImpl {
     public ConceptDTO upsertMedicalInfo(AmendTermVo amendTermVo) {
         ConceptDTO conceptDTO = new ConceptDTO();
 
+//        Map<String, Object> map;
         Medical medical;
         List<Medical> medicals;
 
@@ -103,6 +104,11 @@ 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());
@@ -112,15 +118,15 @@ public class MedicalFacade extends MedicalServiceImpl {
                     Medical exist_medical = medicals.get(0);
                     medical.setId(exist_medical.getId());
                 }
-
-                medical.setConceptId(libraryInfo.getConceptId());
-
-                if (medical.getIsDeleted() == null) {
-                    medical.setIsDeleted("N");
+                else {
+                    medical.setConceptId(libraryInfo.getConceptId());
                 }
 
+
                 this.saveOrUpdate(medical);
 
+//                amendTermVo.setMedicalInfo(medical);
+//                amendTermVo.getMedicalInfo().set(i, medical);
                 conceptDTO.getMedicalInfo().add(medical);
             }
         }

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

@@ -5,7 +5,6 @@
     <!-- 通用查询映射结果 -->
     <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" />
@@ -21,6 +20,7 @@
         <result column="dept" property="dept" />
         <result column="code" property="code" />
         <result column="note" property="note" />
+        <result column="is_deleted" property="isDeleted" />
     </resultMap>