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

src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -429,6 +429,9 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
      */
     public Integer convertType(Integer type, Integer flag) {
         Integer retType = null;
+        if (type == null) {
+            return retType;
+        }
         if (flag.equals(1)) {
             //1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作
             switch (type) {

src/main/java/com/diagbot/rule/LisRule.java

@@ -127,7 +127,7 @@ public class LisRule {
                         }
                         break;
                     case Medicine: // 药品
-                        map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
+                        map = commonRule.compareItem(wordCrfDTO.getDrugSource(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
                             i++;
@@ -221,7 +221,7 @@ public class LisRule {
                         }
                         break;
                     case Medicine: // 药品
-                        map = commonRule.compareItem(wordCrfDTO.getDrug(), ruleBaseDTO);
+                        map = commonRule.compareItem(wordCrfDTO.getDrugSource(), ruleBaseDTO);
                         if (CoreUtil.getMapFlag(map)) {
                             lisOtherDTO.setDrugMsg((List<String>)map.get("msgList"));
                             i++;

src/main/java/com/diagbot/web/KlConceptStaticController.java

@@ -50,7 +50,7 @@ public class KlConceptStaticController {
     @ApiOperation(value = "获取静态知识列表[zhaops]",
             notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作 <br>" +
                     "name： 术语名称<br>" +
-                    "isDeleted： 启用状态：N-启用中、Y-已删除<br>")
+                    "status： 启用状态：1-启用、0-禁用<br>")
     @PostMapping("/getPage")
     @SysLogger("getPage")
     @SuppressWarnings("unchecked")