接口补充

tran-service/src/main/java/com/diagbot/client/hystrix/IcssServiceHystrix.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.Valid;
 
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import com.diagbot.client.IcssServiceClient;
 import com.diagbot.dto.HisInquirysForDjDTO;
@@ -35,5 +36,7 @@ public class IcssServiceHystrix implements IcssServiceClient{
 		log.error("【hystrix】调用{}异常", "hisInquirysForDj");
 		return null;
 	}
+	
+	 //public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO)
 
 }

tran-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -0,0 +1,55 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:标签类型
+ * @Author:zhaops
+ * @time: 2018/11/21 11:39
+ */
+public enum QuestionTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断"),
+    Drug(8, "药品"),
+    DrugClass(9, "药品分类");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    QuestionTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static QuestionTypeEnum getEnum(Integer key) {
+        for (QuestionTypeEnum item : QuestionTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        QuestionTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

tran-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -1,16 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.client.IcssServiceClient;
 import com.diagbot.dto.HisInquirysForDjDTO;
-import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.vo.HisInquirysForDjVO;
-import com.diagbot.web.remote.vo.SaveInquiryVO;
 
 /**
  * @Description: 对接问诊信息业务逻辑
@@ -23,13 +24,34 @@ public class InquiryInfoFacade {
 	@Autowired
 	private IcssServiceClient icssServiceClient;
 	
-	public RespDTO<ReadInquiryDTO> readInquiry(SaveInquiryVO saveInquiryVO) {
-		//return icssServiceClient.readInquiry(readInquiryVO);
-		return null;
-	}
-	
-	public Object hisInquirysForDj(HisInquirysForDjVO hisInquirysForDjVO){
+	public Map<String,Object> readInquirysToHis(HisInquirysForDjVO hisInquirysForDjVO){
+		Map<String,Object> map=new HashMap<String,Object>();
 		RespDTO<List<HisInquirysForDjDTO>> list=icssServiceClient.hisInquirysForDj(hisInquirysForDjVO);
-		return list;
+		List<String> contentList=list.data.get(0).getContentList();
+		for (int i = 0; i < contentList.size(); i++) {
+			//1:主诉;2：现病史3:其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗
+			if((i+1)==QuestionTypeEnum.Symptom.getKey()){
+				map.put("symptomJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Other.getKey()){
+				map.put("otherJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Vital.getKey()){
+				map.put("vitalJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Lis.getKey()){
+				map.put("lisJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Pacs.getKey()){
+				map.put("pacsJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Disease.getKey()){
+				map.put("diagJson",contentList.get(i));
+			}else if((i+1)==QuestionTypeEnum.Drug.getKey()){
+				//map.put("drug",contentList.get(i));
+			}
+		}
+		map.put("doctorId",hisInquirysForDjVO.getDoctorId());
+		map.put("hospitalDeptId",hisInquirysForDjVO.getHospitalDeptId());
+		map.put("hospitalId",hisInquirysForDjVO.getHospitalId());
+		map.put("inquiryCode",hisInquirysForDjVO.getInquiryCode());
+		map.put("patientId",hisInquirysForDjVO.getPatientId());
+		
+		return map;
 	}
 }

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

@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.vo.HisInquirysForDjVO;
@@ -15,11 +14,9 @@ import com.diagbot.vo.HisInquirysForDjVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-
-import javax.validation.Valid;
+import java.util.Map;
 
-import com.diagbot.vo.SaveInquiryToHisVO;
-import com.diagbot.web.remote.vo.SaveInquiryVO;
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -32,13 +29,12 @@ import com.diagbot.web.remote.vo.SaveInquiryVO;
 @RestController
 @RequestMapping("/inquiryInfo")
 @Api(value = "对接问诊信息API", tags = { "对接问诊信息API" })
-@SuppressWarnings("unchecked")
-public class InquiryInfoController {
+@SuppressWarnings("unchecked") class InquiryInfoController {
 	
 	 @Autowired
 	 private InquiryInfoFacade inquiryInfoFacade;
 	 
-	 @ApiOperation(value = "问诊记录回显[by:QQ]",
+	 @ApiOperation(value = "保存问诊记录[by:QQ]",
      notes = "hospitalId: 医院编号，必填<br>" +
              "inquiryCode: 就诊序列号，必填<br>"+
              "patientId: 患者ID ，必填<br>"+
@@ -47,29 +43,13 @@ public class InquiryInfoController {
              "sign:医生名称，内容输入类型：0：结构化 1：文本模式<br>"+
              "type:病历分类(1:门诊,2:住院)"
              )
-	    @PostMapping("/readInquiry")
-	    @SysLogger("readInquiry")
-		public RespDTO<ReadInquiryDTO> readInquiryForHis(@RequestBody SaveInquiryVO saveInquiryVO) {
-			RespDTO<ReadInquiryDTO> dto=inquiryInfoFacade.readInquiry(saveInquiryVO);
-			return RespDTO.onSuc(dto.data);
-			
-		}
-	 
-	 @PostMapping("/saveInquiryToHis")
-	 @SysLogger("saveInquiryToHis")
-	 public RespDTO<Boolean> saveInquiryToHis(@Valid @RequestBody SaveInquiryToHisVO saveInquiryToHisVO) {
-		 
-		
-	     return RespDTO.onSuc(true);
-	 }
-	 
-	 @PostMapping("/hisInquirysForDj")
-	 @SysLogger("hisInquirysForDj")
-	 public RespDTO<Object> hisInquirysForDj(@RequestBody HisInquirysForDjVO hisInquirysForDjVO) {
+	 @PostMapping("/readInquirysToHis")
+	 @SysLogger("readInquirysToHis")
+	 public RespDTO<Map<String,Object>> readInquirysToHis(@Valid @RequestBody HisInquirysForDjVO hisInquirysForDjVO) {
 		 
-		 inquiryInfoFacade.hisInquirysForDj(hisInquirysForDjVO);
+		 Map<String,Object> map=inquiryInfoFacade.readInquirysToHis(hisInquirysForDjVO);
 		
-	     return RespDTO.onSuc(true);
+	     return RespDTO.onSuc(map);
 	 }
 
 }