Merge branch 'dev/data20190828_join' of http://223.93.170.82:10080/gaodm/diagbotcloud into dev/data20190828_join

aipt-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -12,6 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
+    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
 }

aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -35,8 +35,9 @@ public class SearchData {
     private String scaleName;
     private String indications;
 
+    private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 
     //特征类别

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -41,7 +41,8 @@ public class SearchVo {
     private String hosCode;  // 对接时，hosCode必填
     private Integer sysType; //系统类型
 
+    private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 }

data-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -12,6 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
-}
+    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
+}

data-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -38,6 +38,6 @@ public class SearchData {
     private Integer sysType;  //系统类型
 
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 }

data-service/src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -46,7 +46,7 @@ public class AssembleFacade {
         searchData.setHosCode(pushVO.getHosCode());
 
         searchData.setLisOrder(pushVO.getLisOrder());
-        searchData.setPacOrder(pushVO.getPacOrder());
+        searchData.setPacsOrder(pushVO.getPacsOrder());
         searchData.setOtherOrder(pushVO.getOtherOrder());
 
         switch (pushVO.getSex()) {

data-service/src/main/java/com/diagbot/vo/PushJoinVO.java

@@ -42,7 +42,7 @@ public class PushJoinVO {
 
     private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 
     //创建时间

data-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -22,6 +22,6 @@ public class PushVO  extends PushBaseVO {
 
     private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 }

icss-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -12,6 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
-}
+    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
+}

ltapi-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -12,6 +12,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
-}
+    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
+}

tran-service/src/main/java/com/diagbot/vo/PushJoinVO.java

@@ -42,7 +42,7 @@ public class PushJoinVO {
 
     private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
-    private String pacOrder;   //当前正在下单辅检
+    private String pacsOrder;   //当前正在下单辅检
     private String otherOrder; //其他
 
     //创建时间