diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java index 45d0bf37b..e9ebfed2e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java @@ -8,6 +8,10 @@ import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; @@ -26,6 +30,14 @@ public class AdviceSaveDto { /** 医嘱类型 */ private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目 + /** + * 医嘱开始时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + + /** * 请求id */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java index aca5aee11..e1e24c1a1 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java @@ -22,6 +22,12 @@ public class RequestBaseDto { */ private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目 + /** + * 医嘱开始时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + /** * 唯一标识 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index 362f12331..c1b4c1d25 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -439,7 +439,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } // 保存时处理的字段属性 if (is_save) { - longMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间 + longMedicationRequest.setEffectiveDoseStart(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 longMedicationRequest .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); longMedicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 @@ -531,7 +531,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } // 保存时处理的字段属性 if (is_save) { - tempMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间 + tempMedicationRequest.setEffectiveDoseStart(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 tempMedicationRequest .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); tempMedicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 @@ -647,7 +647,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } // 保存时处理的字段属性 if (is_save) { - longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间 + longServiceRequest.setOccurrenceStartTime(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); longServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 longServiceRequest.setQuantity(new BigDecimal("1")); // 请求数量 | 诊疗的长期医嘱数量都是1 @@ -699,7 +699,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } // 保存时处理的字段属性 if (is_save) { - tempServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间 + tempServiceRequest.setOccurrenceStartTime(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 tempServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); tempServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源 tempServiceRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量 @@ -846,7 +846,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { deviceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者 deviceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生 deviceRequest.setOrgId(regAdviceSaveDto.getFounderOrgId()); // 开方人科室 - deviceRequest.setReqAuthoredTime(startTime); // 医嘱开始时间 + deviceRequest.setReqAuthoredTime(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 deviceRequest.setPerformLocation(regAdviceSaveDto.getLocationId()); // 发放科室 deviceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id deviceRequest.setPackageId(regAdviceSaveDto.getPackageId()); // 组套id @@ -889,7 +889,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { deviceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者 deviceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生 deviceRequest.setOrgId(regAdviceSaveDto.getFounderOrgId()); // 开方人科室 - deviceRequest.setReqAuthoredTime(startTime); // 医嘱开始时间 + deviceRequest.setReqAuthoredTime(regAdviceSaveDto.getStartTime() != null ? regAdviceSaveDto.getStartTime() : startTime); // 医嘱开始时间 deviceRequest.setPerformLocation(regAdviceSaveDto.getLocationId()); // 发放科室 deviceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id deviceRequest.setPackageId(regAdviceSaveDto.getPackageId()); // 组套id diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml index aa1c15631..aba35ab23 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml @@ -214,6 +214,7 @@ T1.dispense_per_duration AS dispense_per_duration, T2.part_percent AS part_percent, ccd.name AS condition_definition_name, + T1.effective_dose_start AS start_time, T1.therapy_enum AS therapyEnum, T1.sort_number AS sort_number, T1.based_on_id AS based_on_id, @@ -270,6 +271,7 @@ '' AS condition_definition_name, 2 AS therapyEnum, 99 AS sort_number, + T1.req_authored_time AS start_time, T1.based_on_id AS based_on_id, T1.device_def_id AS advice_definition_id, T1.content_json::jsonb ->> 'remark' AS remark @@ -321,6 +323,7 @@ '' AS condition_definition_name, COALESCE(T1.therapy_enum, 2) AS therapyEnum, 99 AS sort_number, + T1.occurrence_start_time AS start_time, T1.based_on_id AS based_on_id, T1.activity_id AS advice_definition_id, T1.remark AS remark diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue index ea83fcc54..0c127f7bf 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue @@ -16,6 +16,16 @@ ']' }} + + + + + +
+ + +
+ + +