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

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

@@ -42,9 +42,14 @@ public class HospitalInfoDTO {
     private Integer connect;
 
     /**
-     * 导入方式
+     * 化验导入方式
      */
-    private Integer importWay;
+    private Integer importWayLis;
+    
+    /**
+     * 辅检导入方式
+     */
+    private Integer importWayPacs;
 
     /**
      * 备注

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

@@ -616,8 +616,8 @@ public class ConceptFacade extends ConceptServiceImpl {
                                 addConceptInfoVO.setLineNum(count);
                                 addConceptInfoVO.setName(libName);
                                 addConceptInfoVO.setType(libType);
-                                addConceptInfoVO.setMinAge(Integer.parseInt(minAge));
-                                addConceptInfoVO.setMaxAge(Integer.parseInt(maxAge));
+                                addConceptInfoVO.setMinAge(StringUtil.isEmpty(minAge)?0:Integer.parseInt(minAge));
+                                addConceptInfoVO.setMaxAge(StringUtil.isEmpty(minAge)?0:Integer.parseInt(maxAge));
                                 if (sexType.equals("男")) {
                                     addConceptInfoVO.setSexType(1);
                                 } else if (sexType.equals("女")) {

tran-service/src/main/java/com/diagbot/dto/HospitalInfoDTO.java

@@ -42,10 +42,14 @@ public class HospitalInfoDTO {
     private Integer connect;
 
     /**
-     * 导入方式
+     * 化验导入方式
      */
-    private Integer importWay;
-
+    private Integer importWayLis;
+    
+    /**
+     * 辅检导入方式
+     */
+    private Integer importWayPacs;
     /**
      * 备注
      */

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -81,9 +81,14 @@ public class HospitalInfo implements Serializable {
      */
     private Integer orderNo;
     /**
-     * 导入方式
+     * 化验导入方式
      */
-    private Integer importWay;
+    private Integer importWayLis;
+    
+    /**
+     * 辅检导入方式
+     */
+    private Integer importWayPacs;
 
     /**
      * 备注
@@ -191,12 +196,20 @@ public class HospitalInfo implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public Integer getImportWay() {
-		return importWay;
+    public Integer getImportWayLis() {
+		return importWayLis;
+	}
+
+	public void setImportWayLis(Integer importWayLis) {
+		this.importWayLis = importWayLis;
+	}
+
+	public Integer getImportWayPacs() {
+		return importWayPacs;
 	}
 
-	public void setImportWay(Integer importWay) {
-		this.importWay = importWay;
+	public void setImportWayPacs(Integer importWayPacs) {
+		this.importWayPacs = importWayPacs;
 	}
 
 	public String getRemark() {

tran-service/src/main/resources/mapper/HospitalInfoMapper.xml

@@ -16,7 +16,8 @@
         <result column="spell" property="spell" />
         <result column="status" property="status" />
         <result column="order_no" property="orderNo" />
-        <result column="import_way" property="importWay" />
+        <result column="import_way_lis" property="importWayLis" />
+        <result column="import_way_pacs" property="importWayPacs" />
         <result column="connect" property="connect" />
         <result column="remark" property="remark" />
     </resultMap>