门诊挂号-部分

openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml

@@ -19,6 +19,7 @@
             T3.extra_details,
             T3.contact,
             T3.appointment_required_flag,
+            T3.definition_id,
             T3.charge_name,
             T3.price
         FROM
@@ -37,6 +38,7 @@
                     T1.extra_details,
                     T1.contact,
                     T1.appointment_required_flag,
+                    T2.id AS definition_id,
                     T2.charge_name,
                     T2.price
                 FROM

openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml

@@ -12,8 +12,7 @@
                T3.py_str,
                T3.wb_str
         FROM (
-                 SELECT
-                        T1.tenant_id,
+                 SELECT T1.tenant_id,
                         T1.ID,
                         T1.NAME,
                         T1.gender_enum,
@@ -30,4 +29,14 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getNumByPatientIdAndOrganizationId" resultType="Integer">
+        SELECT COUNT
+                   (1)
+        FROM adm_encounter
+        WHERE delete_flag = '0'
+          AND patient_id = #{patientId}
+          AND service_type_id = #{serviceTypeId}
+          AND create_time > CURRENT_DATE
+    </select>
+
 </mapper>