web:调整代码

dev_2.0.0
xueqingkun 1 year ago
parent 737755651f
commit 9dae6a0791

@ -63,7 +63,7 @@ public class ConfigDrug implements Serializable {
private String skinTestFlag;
/**
* l
*
*/
private Integer costType;

@ -46,6 +46,8 @@
pr.create_time as createTime,
pm.process_id as processId,
pm.disease_id as diseaseId,
pm.patient_self_desc as patientSelfDesc,
pm.operation_history as operationHistory,
mr.id as medicalRecId,
mr.no as medicalRecNo,
mr.patient_name as patientName,

@ -1,8 +1,10 @@
package com.supervision.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.supervision.model.Process;
import com.supervision.model.ProcessMedical;
import com.supervision.model.User;
@ -52,12 +54,17 @@ public class MedicalRecordServiceImpl implements MedicalRecordService {
@Override
public boolean saveOrUpdateMedicalRecord(ProcessMedical processMedical) {
log.info(JSONUtil.toJsonStr(processMedical));
if (StrUtil.isEmpty(processMedical.getId())){
// 走新增逻辑
Assert.notEmpty(processMedical.getProcessId(),"流程id不为空");
List<ProcessMedical> list = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processMedical.getProcessId()).list();
if (CollUtil.isEmpty(list)){
// 新增
return saveMedicalRecord(processMedical);
}
// 修改
processMedical.setId(CollUtil.getFirst(list).getId());
return processMedicalService.updateById(processMedical);
}

Loading…
Cancel
Save