Commit 930377df by zhangxingmin

push

parent 0783d506
...@@ -79,6 +79,11 @@ ...@@ -79,6 +79,11 @@
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.yd</groupId>
<artifactId>yd-question-feign</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -23,6 +23,8 @@ import com.yd.csf.service.model.Fna; ...@@ -23,6 +23,8 @@ import com.yd.csf.service.model.Fna;
import com.yd.csf.service.model.ProductPlan; import com.yd.csf.service.model.ProductPlan;
import com.yd.csf.service.service.FnaService; import com.yd.csf.service.service.FnaService;
import com.yd.csf.service.service.IAppointmentService; import com.yd.csf.service.service.IAppointmentService;
import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
import com.yd.question.feign.request.ApiObjectSaveRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -70,6 +72,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -70,6 +72,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
@Autowired @Autowired
private FnaService fnaService; private FnaService fnaService;
@Autowired
private ApiQuestionnairesFeignClient apiQuestionnairesFeignClient;
/** /**
* 预约分页查询 * 预约分页查询
* @param request * @param request
...@@ -165,6 +170,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -165,6 +170,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//添加第二持有人信息表数据 //添加第二持有人信息表数据
apiSecondHolderService.addSecondHolderData(request.getApiSecondHolderInfoDto(),appointment.getAppointmentBizId()); apiSecondHolderService.addSecondHolderData(request.getApiSecondHolderInfoDto(),appointment.getAppointmentBizId());
//新增健康问卷和预约对象关系绑定
objectSaveJkQuestion(appointment.getAppointmentBizId());
//预约编号和预约业务id更新到FNA表(提交待预约状态,预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号) //预约编号和预约业务id更新到FNA表(提交待预约状态,预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号)
updateFnaBizIdAndNo(appointment.getFnaBizId(),appointment.getAppointmentBizId(),appointment.getAppointmentNo()); updateFnaBizIdAndNo(appointment.getFnaBizId(),appointment.getAppointmentBizId(),appointment.getAppointmentNo());
ApiAppointmentAddResponse response = new ApiAppointmentAddResponse(); ApiAppointmentAddResponse response = new ApiAppointmentAddResponse();
...@@ -222,6 +230,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -222,6 +230,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//添加第二持有人信息表数据 //添加第二持有人信息表数据
apiSecondHolderService.addSecondHolderData(request.getApiSecondHolderInfoDto(),appointment.getAppointmentBizId()); apiSecondHolderService.addSecondHolderData(request.getApiSecondHolderInfoDto(),appointment.getAppointmentBizId());
//新增健康问卷和预约对象关系绑定
objectSaveJkQuestion(appointment.getAppointmentBizId());
return Result.success(); return Result.success();
} }
...@@ -446,13 +457,19 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -446,13 +457,19 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
return Result.success(); return Result.success();
} }
// /** /**
// * 保存健康问卷和预约对象关系绑定 * 新增健康问卷和预约对象关系绑定
// * @return * @return
// */ */
// public Result objectSaveQuestion() { public Result objectSaveJkQuestion(String appointmentBizId) {
// ApiObjectSaveRequest apiObjectSaveRequest = new ApiObjectSaveRequest();
// } apiObjectSaveRequest.setObjectBizId(appointmentBizId);
apiObjectSaveRequest.setObjectName("预约");
apiObjectSaveRequest.setObjectTableName("appointment");
apiObjectSaveRequest.setQuestionnaireBizId("questionnaires_1001");
apiQuestionnairesFeignClient.objectSave(apiObjectSaveRequest);
return Result.success();
}
/** /**
* 校验预约信息是否存在 * 校验预约信息是否存在
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment