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