246 手术管理-》门诊手术安排：点击【编辑】填写手术过程的相关时间字段值点击【保存】报错

251 手术管理-》门诊手术安排：【新增手术安排】界面安排时间字段的时分秒无法选值和未显示
252 手术管理-》门诊手术安排：【新增手术安排】界面的麻醉方法字段未默认取值于手术申请的麻醉方式字段的值
254 手术管理-》门诊手术管理：【新增手术安排】界面的切口类型字段下拉选项未取值

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -1,5 +1,6 @@
 package com.openhis.web.clinicalmanage.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.openhis.surgicalschedule.domain.OpSchedule;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -55,6 +56,7 @@ public class OpScheduleDto extends OpSchedule {
     /**
      * 申请时间开始
      */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private String applyTime;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/IssueDto.java

@@ -100,10 +100,12 @@ public class IssueDto {
 
     /** 开始时间 */
     @NotNull
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     /** 结束时间 */
     @NotNull
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /** 单价 */

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -76,6 +76,7 @@
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
         WHERE os.schedule_id = #{scheduleId}
+        LIMIT 1
     </select>
 <!--    新增手术安排-->
     <insert id="addSurgerySchedule" useGeneratedKeys="true" keyProperty="scheduleId">

openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -75,11 +75,11 @@ public class OpSchedule extends HisBaseEntity {
     private String surgerySite;
 
     /** 入院时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime admissionTime;
 
     /** 入手术室时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime entryTime;
 
     /** 手术室编码 */
@@ -138,19 +138,19 @@ public class OpSchedule extends HisBaseEntity {
     private String assistant3Code;
 
     /** 手术开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime startTime;
 
     /** 手术结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime endTime;
 
     /** 麻醉开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime anesStart;
 
     /** 麻醉结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime anesEnd;
 
     /** 手术状态 */

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1048,6 +1048,8 @@ function submitForm() {
         // 新增手术
         addSurgery(form.value).then((res) => {
           proxy.$modal.msgSuccess('新增成功')
+          //保存麻醉方式
+          seesionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
           open.value = false
           getList()
         }).catch(error => {
@@ -1058,6 +1060,7 @@ function submitForm() {
         // 修改手术
         updateSurgery(form.value).then((res) => {
           proxy.$modal.msgSuccess('修改成功')
+          seesionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
           open.value = false
           getList()
         }).catch(error => {

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -1023,15 +1023,20 @@ function mapOperatingRoomToOption(item) {
 const {
   surgical_site: surgerySiteList,
   anesthesia_type: anesthesiaList,
-  incision_type: incisionTypeList,
+  incision_level: incisionTypeList,
   isolation_type: isolationTypeList,
   surgery_type,
   surgery_level,
   surgery_nature: surgeryNatureList
-} = useDict('surgical_site', 'anesthesia_type', 'incision_type', 'isolation_type', 'surgery_type', 'surgery_level', 'surgery_nature')
+} = useDict('surgical_site', 'anesthesia_type', 'incision_level', 'isolation_type', 'surgery_type', 'surgery_level', 'surgery_nature')
 
 // 加载数据
 onMounted(() => {
+  const anesthesiaType = sessionStorage.getItem('anesthesiaType')
+       if (anesthesiaType) {
+         form.anesMethod = anesthesiaType
+         sessionStorage.removeItem('anesthesiaType')
+       }
   getPageList()
   loadOrgList()
   loadDeptList()