需求17 门诊医生站-》患者列表；从adm_encounter表中查询到first_enum字段用以判断初复诊

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -111,6 +111,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             e.setAge(e.getBirthDate() != null ? AgeCalculatorUtil.getAge(e.getBirthDate()) : "");
             // 就诊状态
             e.setStatusEnum_enumText(EnumUtils.getInfoByValue(EncounterStatus.class, e.getStatusEnum()));
+            // 初复诊
+            e.setFirstEnum_enumText(EnumUtils.getInfoByValue(EncounterType.class, e.getFirstEnum()));
         });
         return patientInfo;
     }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java

@@ -133,4 +133,10 @@ public class PatientInfoDto {
      * 过号时间
      */
     private Date missedTime;
+    
+    /**
+     * 初复诊标识
+     */
+    private Integer firstEnum;
+    private String firstEnum_enumText;
 }

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml

@@ -25,7 +25,9 @@
         T10.jz_practitioner_user_id,
         T10.bus_no,
         T10.identifier_no,
-        T10.missed_time
+        T10.missed_time,
+        T10.first_enum,
+        T10.first_enum_enumText
         from
         (
         SELECT T1.tenant_id AS tenant_id,
@@ -52,7 +54,13 @@
         T1.organization_id AS org_id,
         T8.bus_no AS bus_no,
         T9.identifier_no AS identifier_no,
-        T1.missed_time AS missed_time
+        T1.missed_time AS missed_time,
+        T1.first_enum AS first_enum,
+        CASE 
+            WHEN T1.first_enum = 1 THEN '初诊'
+            WHEN T1.first_enum = 2 THEN '复诊'
+            ELSE NULL
+        END AS first_enum_enumText
         FROM adm_encounter AS T1
         LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
         LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'