|
|
@@ -83,6 +83,17 @@ public class DataPageDockFacade {
|
|
|
dataPageDockNbrmVo.setHospitalId(Long.valueOf("4"));
|
|
|
PushJoinVO pushJoinVO = new PushJoinVO();
|
|
|
BeanUtil.copyProperties(dataPageDockNbrmVo, pushJoinVO);
|
|
|
+ //5.0字段转换6.0字段
|
|
|
+ pushJoinVO.setPasts(dataPageDockNbrmVo.getMedicalHistory().getPasts());
|
|
|
+ pushJoinVO.setInfectious(dataPageDockNbrmVo.getMedicalHistory().getInfectious());
|
|
|
+ pushJoinVO.setAllergy(dataPageDockNbrmVo.getMedicalHistory().getAllergy());
|
|
|
+ pushJoinVO.setPasts(dataPageDockNbrmVo.getMedicalHistory().getPasts());
|
|
|
+ pushJoinVO.setVaccination(dataPageDockNbrmVo.getMedicalHistory().getVaccination());
|
|
|
+ pushJoinVO.setPersonal(dataPageDockNbrmVo.getMedicalHistory().getPersonal());
|
|
|
+ pushJoinVO.setMarital(dataPageDockNbrmVo.getMedicalHistory().getMarital());
|
|
|
+ pushJoinVO.setFamily(dataPageDockNbrmVo.getMedicalHistory().getFamily());
|
|
|
+ pushJoinVO.setMenstrual(dataPageDockNbrmVo.getMedicalHistory().getMenstrual());
|
|
|
+ pushJoinVO.setOther(dataPageDockNbrmVo.getMedicalHistory().getOther());
|
|
|
pushJoinVO.setAge(dataPageDockNbrmVo.getAge().toString());
|
|
|
// 将基本参数保存到redis
|
|
|
String mrId = mrFacade.createMr(pushJoinVO);
|
|
|
@@ -91,7 +102,7 @@ public class DataPageDockFacade {
|
|
|
//开单合理性
|
|
|
case "5":
|
|
|
IndicationPushVO indicationPushVO=new IndicationPushVO();
|
|
|
- BeanUtil.copyProperties(dataPageDockNbrmVo, indicationPushVO);
|
|
|
+ BeanUtil.copyProperties(pushJoinVO, indicationPushVO);
|
|
|
indicationPushVO.setRuleType("2");
|
|
|
IndicationDTO indicationDTO=pushFacade.indicationPush(indicationPushVO);
|
|
|
if (indicationDTO.getBillMsgList().size()==0){
|
shiyue