病历评级入参修改

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

@@ -35,6 +35,10 @@ public class SearchData {
     private String scaleName;
     private String indications;
 
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
+
     //特征类别
     private String featureType;
     //特征类别对","进行分割后数据

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.FeatureRate;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.bean.MedicalIndication;
 import com.diagbot.client.bean.MedicalIndicationDetail;
@@ -36,7 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;

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

@@ -40,4 +40,8 @@ public class SearchVo {
     private Integer disType;    //诊断类型
     private String hosCode;  // 对接时，hosCode必填
     private Integer sysType; //系统类型
+
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
 }

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -51,7 +51,11 @@ public class PushController {
                     "diseaeName：取治疗方案的诊断,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,List<不良反应明细><br>")
+                    "adverseReactions：不良反应,List<不良反应明细><br>" +
+                    "lis：化验纯文本,String<br>" +
+                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
+                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/treatment")
     @SysLogger("treatment")
     public RespDTO<Map<String, Object>> getTreatment(@Valid @RequestBody SearchVo searchVo) {
@@ -80,11 +84,15 @@ public class PushController {
                     "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,List<不良反应明细><br>")
+                    "adverseReactions：不良反应,List<不良反应明细><br>" +
+                    "lis：化验纯文本,String<br>" +
+                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
+                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@Valid @RequestBody SearchVo searchVo) {
         PushDTO data = pushFacade.pushInner(searchVo);
         return RespDTO.onSuc(data);
     }
-}
+}

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

@@ -36,4 +36,8 @@ public class SearchData {
     private String hosCode;
     @ApiModelProperty(hidden = true)
     private Integer sysType;  //系统类型
+
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
 }

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

@@ -29,6 +29,7 @@ public class AssembleFacade {
         searchData.setAge(pushVO.getAge());
         searchData.setSymptom(pushVO.getSymptom());
         searchData.setVital(pushVO.getVital());
+        searchData.setLis(pushVO.getLisString());
         searchData.setPacs(pushVO.getPacs());
         searchData.setPast(pushVO.getPast());
         searchData.setOther(pushVO.getOther());
@@ -44,6 +45,10 @@ public class AssembleFacade {
         searchData.setSysType(SysTypeEnum.DATA_SERVICE.getKey());
         searchData.setHosCode(pushVO.getHosCode());
 
+        searchData.setLisOrder(pushVO.getLisOrder());
+        searchData.setPacOrder(pushVO.getPacOrder());
+        searchData.setOtherOrder(pushVO.getOtherOrder());
+
         switch (pushVO.getSex()) {
             case 1:
                 searchData.setSex("M");

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

@@ -52,4 +52,9 @@ public class PushJoinVO {
     //过期时间字符串
     @ApiModelProperty(hidden = true)
     private String expireTimeStr;
+
+    private String lisString;  //化验纯文本
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
 }

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

@@ -19,4 +19,9 @@ public class PushVO  extends PushBaseVO {
     private String adverseReactions; //不良反应
     private String indications;   //推理指标
     private String hosCode;   //医院编码
+
+    private String lisString;  //化验纯文本
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
 }

data-service/src/main/java/com/diagbot/web/PushController.java

@@ -52,7 +52,11 @@ public class PushController {
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>")
+                    "adverseReactions：不良反应,String<br>" +
+                    "lisString：化验纯文本,String<br>" +
+                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
+                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/push")
     @SysLogger("push")
     public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
@@ -81,7 +85,11 @@ public class PushController {
                     "diseaeName：取治疗方案的诊断,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>")
+                    "adverseReactions：不良反应,String<br>" +
+                    "lisString：化验纯文本,String<br>" +
+                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
+                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
     public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
@@ -111,7 +119,11 @@ public class PushController {
                     "scaleName：量表名称,String<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>")
+                    "adverseReactions：不良反应,String<br>" +
+                    "lisString：化验纯文本,String<br>" +
+                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
+                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
+                    "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushScale")
     @SysLogger("pushScale")
     public RespDTO<Map<String, Object>> pushScale(@RequestBody @Valid PushVO pushVO) {

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

@@ -52,4 +52,9 @@ public class PushJoinVO {
     //过期时间字符串
     @ApiModelProperty(hidden = true)
     private String expireTimeStr;
+
+    private String lisString;  //化验纯文本
+    private String lisOrder;   //当前正在下单化验
+    private String pacOrder;   //当前正在下单辅检
+    private String otherOrder; //其他
 }

tran-service/src/main/java/com/diagbot/web/MrController.java

@@ -1,12 +1,8 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.LisConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MrFacade;
-import com.diagbot.facade.TranLisConfigFacade;
-import com.diagbot.vo.LisConfigVO;
-import com.diagbot.vo.LisHospitalCodeVO;
 import com.diagbot.vo.MrVO;
 import com.diagbot.vo.PushJoinVO;
 import io.swagger.annotations.Api;
@@ -18,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 病历保存到redis控制层