Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tcm/src/main/resources/mapper_dao/PatientDao.xml

@@ -16,7 +16,7 @@
 	t_conference_records tcr
 	WHERE
     tcr.rec_status=0
-    <if test="id != null">
+    <if test="id != null and id!=0 ">
       and id = #{param.id}
     </if>
     <if test="id == null">
@@ -96,17 +96,17 @@
         t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
         WHERE
         tpi.rec_status =0
-        <if test="id != null">
+        <if test="id != null and id!=0">
             and tpi.id=#{id}
         </if>
         <if test="id == null">
-            <if test="hospitalization!=null">
+            <if test="hospitalization!=null and hospitalization!='' ">
                 and tpi.hospitalization=#{hospitalization}
             </if>
-            <if test="inpatientId!=null">
+            <if test="inpatientId!=null and inpatientId!=0 ">
                 and tpi.inpatient_id= #{inpatientId}
             </if>
-            <if test="inputStatus!=null">
+            <if test="inputStatus!=null and inputStatus!=0 ">
                 and tpi.input_status= #{inputStatus}
             </if>
         </if>
@@ -114,13 +114,13 @@
     <select id="countCase" resultType="java.lang.Integer">
         select count(*) as nums from t_patient_information tpi
         where tpi.rec_status=0
-        <if test="param.userId!=null">
+        <if test="param.userId!=null and param.userId!=0 ">
             and tpi.user_id=#{param.userId}
         </if>
-        <if test="param.hospitalId!=null">
+        <if test="param.hospitalId!=null and param.hospitalId!=0 ">
             and tpi.hospital_id=#{param.hospitalId}
         </if>
-        <if test="inputStatus!=null">
+        <if test="inputStatus!=null and inputStatus!=0 ">
             and tpi.input_status=#{inputStatus}
         </if>
         <if test="param.startDate!=null">