|
@@ -100,7 +100,7 @@ public class DataPageDockFacade {
|
|
|
* @Author:liuqq
|
|
|
* @time: ${DATE} ${TIME}
|
|
|
**/
|
|
|
- public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO, String xmlText) {
|
|
|
+ public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
|
|
|
if (StringUtil.isNotEmpty(dataPageDockVO.getHospitalCode()) && StringUtil.isNotEmpty(dataPageDockVO.getHospitalName())) {
|
|
|
//基层子医院业务逻辑
|
|
|
Long hospitalId = getHospitalRelation(dataPageDockVO.getHospitalCode(), dataPageDockVO.getHospitalName());
|
|
@@ -116,14 +116,7 @@ public class DataPageDockFacade {
|
|
|
return RespDTO.onError("请输入展示类型,横版:ver,或竖版hor");
|
|
|
} else if ("".equals(dataPageDockVO.getPlanCode())) {
|
|
|
return RespDTO.onError("请输入方案编码");
|
|
|
- } else if ("".equals(dataPageDockVO.getXmlText())) {
|
|
|
- return RespDTO.onError("请生成XML内容");
|
|
|
}
|
|
|
- if (StringUtil.isBlank(xmlText)) {
|
|
|
- xmlText = dataPageDockVO.getXmlText();
|
|
|
- }
|
|
|
- //解析XML文本(重庆石柱)
|
|
|
- analyzeXml(dataPageDockVO, xmlText);
|
|
|
|
|
|
//初始日志记录信息
|
|
|
dataPageDockVO.setSubHospitalCode(dataPageDockVO.getHospitalCode());
|