|
@@ -56,7 +56,7 @@ public class PushFacade {
|
|
}
|
|
}
|
|
SearchData searchData = new SearchData();
|
|
SearchData searchData = new SearchData();
|
|
BeanUtil.copyProperties(pushVO, searchData);
|
|
BeanUtil.copyProperties(pushVO, searchData);
|
|
- //TODO 入参映射
|
|
|
|
|
|
+ //入参映射
|
|
searchData = assembleFacade.assembleData(searchData);
|
|
searchData = assembleFacade.assembleData(searchData);
|
|
BeanUtil.copyProperties(searchData, pushVO);
|
|
BeanUtil.copyProperties(searchData, pushVO);
|
|
RespDTO<PushDTO> resp = cdssCoreClient.push(pushVO);
|
|
RespDTO<PushDTO> resp = cdssCoreClient.push(pushVO);
|
|
@@ -137,14 +137,14 @@ public class PushFacade {
|
|
treatDTO1.setUniqueName("无晶状体眼");
|
|
treatDTO1.setUniqueName("无晶状体眼");
|
|
treat.add(treatDTO1);
|
|
treat.add(treatDTO1);
|
|
data.setTreat(treat);
|
|
data.setTreat(treat);
|
|
- //TODO 出参映射
|
|
|
|
|
|
+ //出参映射
|
|
data = assembleFacade.assemblePushDTO(data, pushVO.getHospitalId());
|
|
data = assembleFacade.assemblePushDTO(data, pushVO.getHospitalId());
|
|
- //TODO 是否有静态信息
|
|
|
|
|
|
+ //是否有静态信息
|
|
if (pushVO.getGetStaticKnowledge() != null
|
|
if (pushVO.getGetStaticKnowledge() != null
|
|
&& pushVO.getGetStaticKnowledge().equals(1)) {
|
|
&& pushVO.getGetStaticKnowledge().equals(1)) {
|
|
data = getStaticKnoledge(data);
|
|
data = getStaticKnoledge(data);
|
|
}
|
|
}
|
|
- //TODO 一般治疗
|
|
|
|
|
|
+ //一般治疗
|
|
if (data != null) {
|
|
if (data != null) {
|
|
data.setTreat(retGeneraTreat(data, pushVO.getHospitalId()));
|
|
data.setTreat(retGeneraTreat(data, pushVO.getHospitalId()));
|
|
}
|
|
}
|
|
@@ -159,7 +159,7 @@ public class PushFacade {
|
|
public IndicationDTO indicationPush(IndicationPushVO indicationPushVO) {
|
|
public IndicationDTO indicationPush(IndicationPushVO indicationPushVO) {
|
|
SearchData searchData = new SearchData();
|
|
SearchData searchData = new SearchData();
|
|
BeanUtil.copyProperties(indicationPushVO, searchData);
|
|
BeanUtil.copyProperties(indicationPushVO, searchData);
|
|
- //TODO 入参映射
|
|
|
|
|
|
+ //入参映射
|
|
searchData = assembleFacade.assembleData(searchData);
|
|
searchData = assembleFacade.assembleData(searchData);
|
|
BeanUtil.copyProperties(searchData, indicationPushVO);
|
|
BeanUtil.copyProperties(searchData, indicationPushVO);
|
|
// IndicationDTO indicationDTO = new IndicationDTO();
|
|
// IndicationDTO indicationDTO = new IndicationDTO();
|