后端最新版本同步

openhis-server-new/openhis-application/src/main/resources/mapper/document/DocRecordAppMapper.xml

@@ -32,7 +32,7 @@
         t1.end_time,
         t1.class_enum,
         t1.primary_menu_enum,
-        t1.doc_name,
+        t1.name,
         t1.tenant_id
         FROM
         (SELECT
@@ -49,7 +49,7 @@
         e.reception_time,
         e.class_enum,
         d.primary_menu_enum,
-        d.name as doc_name,
+        d.name ,
         t.id,
         t.definition_id,
         t.definition_bus_no,
@@ -86,6 +86,52 @@
         )t1
         ${ew.customSqlSegment}
     </select>
-
+    <select id="getRecordPageListByEncounterId" parameterType="java.util.Map"
+            resultType="com.openhis.web.document.dto.DocRecordDto">
+        SELECT t1.id,
+               t1.definition_id,
+               t1.definition_bus_no,
+               t1.content_json,
+               t1.status_enum,
+               t1.organization_id,
+               t1.encounter_id,
+               t1.patient_id,
+               t1.record_time,
+               t1.tenant_id,
+               t1.delete_flag,
+               t1.create_by,
+               t1.create_time,
+               t1.update_by,
+               t1.update_time,
+               t1.name,
+               t1.version,
+               t1.tenant_id
+        FROM
+            (SELECT
+                 d.name ,
+                 d.version,
+                 t.id,
+                 t.definition_id,
+                 t.definition_bus_no,
+                 t.content_json,
+                 t.status_enum,
+                 t.organization_id,
+                 t.encounter_id,
+                 t.patient_id,
+                 t.record_time,
+                 t.delete_flag,
+                 t.create_by,
+                 t.create_time,
+                 t.update_by,
+                 t.update_time,
+                 t.tenant_id
+             FROM doc_record t
+                      LEFT JOIN doc_definition d
+                                on d.id=t.definition_id
+             where t.delete_flag='0'
+             order by t.record_time desc
+            )t1
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>