fix: Bug#362 添加入科时间字段并修正显示

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java

@@ -50,6 +50,10 @@ public class NursingPageDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date admissionDate;
 
+    /** 入科日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date wardAdmissionDate;
+
     /** 科室ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/PatientHomeDto.java

@@ -229,6 +229,12 @@ public class PatientHomeDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date admissionDate;
 
+    /**
+     * 入科日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date wardAdmissionDate;
+
     /**
      * 出院日期
      */

openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/NursingRecordAppMapper.xml

@@ -13,6 +13,7 @@
                T5.org_id,
                T5.encounter_id,
                T5.admissionDate,
+               T5.wardAdmissionDate,
                T5.ward_location_id,
                T5.bed_location_id
         FROM (SELECT T1.tenant_id,
@@ -34,11 +35,13 @@
                         INNER JOIN (SELECT encounter_id,
                                            location_id,
                                            form_enum,
-                                           delete_flag
+                                           delete_flag,
+                                           start_time as ward_admission_date
                                     FROM (SELECT encounter_id,
                                                  location_id,
                                                  form_enum,
                                                  delete_flag,
+                                                 start_time,
                                                  ROW_NUMBER() OVER (PARTITION BY encounter_id
                                                     ORDER BY
                                                     CASE

openhis-server-new/openhis-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml

@@ -44,6 +44,7 @@
             status_enum,
             organization_id,
             admissionDate,
+            wardAdmissionDate,
             dischargeDate,
             class_enum,
             responsibleDoctor,
@@ -100,6 +101,14 @@
                     T2.status_enum, -- 患者状态
                     T2.organization_id,-- 入院科室
                     T2.start_time AS admissionDate, -- 入院日期
+                    (SELECT ael.start_time 
+                     FROM adm_encounter_location ael 
+                     WHERE ael.encounter_id = T2.id 
+                       AND ael.form_enum = 8 
+                       AND ael.status_enum = 2 
+                       AND ael.delete_flag = '0' 
+                     ORDER BY ael.create_time DESC 
+                     LIMIT 1) AS wardAdmissionDate, -- 入科日期
                     T2.end_time AS dischargeDate, -- 出院日期
                     T2.class_enum, -- 就诊类别
                     -- 获取责任医生（使用子查询确保只返回一个值）

openhis-ui-vue3/src/views/inpatientNurse/home/components/patientCard.vue

@@ -66,8 +66,8 @@
               </div>
               <div class="row">
                 <div class="layui-inline">
-                  <div>入院</div>
-                  <div>{{ o.admissionDate }}</div>
+                  <div>入科</div>
+                  <div>{{ o.wardAdmissionDate }}</div>
                 </div>
               </div>
               <div class="row">

openhis-ui-vue3/src/views/inpatientNurse/home/components/patientDetialDialog.vue

@@ -237,9 +237,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="入院日期：" prop="admissionDate">
+            <el-form-item label="入科日期：" prop="wardAdmissionDate">
               <el-input
-                v-model="form.admissionDate"
+                v-model="form.wardAdmissionDate"
                 placeholder=""
                 clearable
                 style="width: 260px"

openhis-ui-vue3/src/views/inpatientNurse/home/index.vue

@@ -100,7 +100,7 @@
           min-width="120"
           align="center"
         />
-        <el-table-column label="入院日期" prop="admissionDate" min-width="120" align="center" />
+        <el-table-column label="入科日期" prop="wardAdmissionDate" min-width="120" align="center" />
         <el-table-column
           label="护理级别"
           prop="priorityEnum_enumText"

openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue

@@ -296,7 +296,7 @@ function viewPatient(row) {
   data1.grParamBOS.hosNum = row.encounterId;
 
   // 入科时间存在的场合使用入科时间
-  data1.grParamBOS.inDate = row.admissionDate;
+  data1.grParamBOS.inDate = row.wardAdmissionDate;
 
   console.log(
     'patientInfo.admissionDate',

openhis-ui-vue3/src/views/inpatientNurse/tprsheet/components/details.vue

@@ -494,7 +494,7 @@ function viewPatient(row = {}) {
   data1.grParamBOS.hosNum = row.encounterId;
   data1.grParamBOS.sex = row.genderEnum_enumText;
   // 入科时间存在的场合使用入科时间
-  data1.grParamBOS.inDate = row.admissionDate;
+  data1.grParamBOS.inDate = row.wardAdmissionDate;
   data1.grParamBOS.name = row.patientName;
   data1.grParamBOS.operaDays = null;
   data1.grParamBOS.weekNo = null;