update: 医生端手术信息列表和患者信息列表代码

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/vo/WxDoctorPatientVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -15,7 +16,11 @@ import java.util.Date;
  */
 @Data
 @ApiModel("医生端患者列表信息")
-public class WxDoctorPatientVO {
+public class WxDoctorPatientVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("患者ID")
+    private String id;
 
     @ApiModelProperty("住院号")
     private String patientCode;

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizPatientMapper.xml

@@ -12,21 +12,32 @@
         <result property="patientGender" column="gender"/>
         <result property="patientCardNo" column="card_no"/>
     </resultMap>
-
     <select id="selectPatientList" resultMap="PatientAndClinicResult">
-        SELECT queryResult.patient_code,
+        SELECT
         queryResult.countResult,
+        bp.id,
         bp.name,
         bp.birthday,
         bp.gender,
-        bp.card_no
-        FROM ( (SELECT patient_id, patient_code, COUNT(1) AS countResult
-        FROM biz_clinic_room
-        GROUP BY patient_code, patient_id)) AS queryResult
-        JOIN biz_patient AS bp ON queryResult.patient_id = bp.id
+        bp.current_clinic_id,
+        bp.card_no,
+        bp.patient_code
+        FROM
+        ( SELECT patient_id, COUNT ( 1 ) AS countResult FROM biz_clinic_room
+        <where>
+            <if test="query.queryTime != null and query.queryTime.size() > 0">
+                AND clinic_start_time >= #{query.queryTime[0]}
+            </if>
+            <if test="query.queryTime != null and query.queryTime.size() > 1">
+                AND clinic_start_time &lt;= #{query.queryTime[1]}
+            </if>
+        </where>
+        GROUP BY patient_id ) AS
+        queryResult
+        JOIN biz_patient AS bp ON queryResult.patient_id = bp."id"
         <where>
             <if test="query.queryCondition != null and query.queryCondition != ''">
-                and queryResult.patient_code LIKE concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
+                bp.patient_code LIKE concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
                 or bp.name like concat('%',#{query.queryCondition,jdbcType=VARCHAR},'%')
             </if>
         </where>