Merge branch 'dev/20200903_1.4.5' into debug

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -340,7 +340,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
 
     // 化验
-        //List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
+       // List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
     //使用sql进行关联优化数据查询
         List<MedLisResultDTO> medLisResultListDTO = medLisResultFacade.getMedLisResultList(behospitalInfoList.get(0));
         List<MedLisResult> medLisResultList =new ArrayList<>();
@@ -474,7 +474,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return medLisResultList;
     }*/
 
-/*    private List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo) {
+   /* private List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo) {
         String behospitalDate = null, leaveHospitalDate = null;
         try {
             behospitalDate = DateUtil.format(behospitalInfo.getBehospitalDate(), DateUtil.DATE_TIME_FORMAT);

src/main/resources/mapper/MedLisResultMapper.xml

@@ -4,47 +4,55 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisResult">
-        <result column="rep_no" property="repNo" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="item_code" property="itemCode" />
-        <result column="item_name" property="itemName" />
-        <result column="result" property="result" />
-        <result column="reference" property="reference" />
-        <result column="reference_min" property="referenceMin" />
-        <result column="reference_max" property="referenceMax" />
-        <result column="unit" property="unit" />
-        <result column="abnormal" property="abnormal" />
-        <result column="color" property="color" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
+        <result column="rep_no" property="repNo"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="item_code" property="itemCode"/>
+        <result column="item_name" property="itemName"/>
+        <result column="result" property="result"/>
+        <result column="reference" property="reference"/>
+        <result column="reference_min" property="referenceMin"/>
+        <result column="reference_max" property="referenceMax"/>
+        <result column="unit" property="unit"/>
+        <result column="abnormal" property="abnormal"/>
+        <result column="color" property="color"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
     </resultMap>
-    <select id="getMedLisResults" parameterType="com.diagbot.entity.BehospitalInfo" resultType="com.diagbot.dto.MedLisResultDTO">
+    <select id="getMedLisResults" parameterType="com.diagbot.entity.BehospitalInfo"
+            resultType="com.diagbot.dto.MedLisResultDTO">
         SELECT
-        t1.rep_no,t1.rep_name repName,t2.behospital_code,t2.hospital_id,t2.item_code,t2.item_name reportName,t2.result,t2.reference,t2.reference_max,t2.reference_min,
+        t1.rep_no,t1.rep_name repName,t2.behospital_code,t2.hospital_id,t2.item_code,t2.item_name
+        reportName,t2.result,t2.reference,t2.reference_max,t2.reference_min,
         t2.unit,t2.abnormal,t2.color,t2.is_deleted,t2.gmt_create,t2.gmt_modified,t2.creator,t2.modifier
         FROM
-            med_lis_info t1,
-            med_lis_result t2
+        med_lis_info t1,
+        med_lis_result t2
         WHERE
-            t1.is_deleted = "N"
+        t1.is_deleted = "N"
         and t2.is_deleted = "N"
         AND t1.rep_name IS NOT NULL
         AND t1.check_date IS NOT NULL
         AND t2.item_name IS NOT NULL
-        and t1.hospital_id = #{hospitalId}
         and t1.hospital_id = t2.hospital_id
         and t1.behospital_code = t2.behospital_code
-        and t1.behospital_code = #{behospitalCode}
-        and t2.rep_no in(t1.rep_no)
+        <if test="fileCode != null and fileCode != ''">
+            and t1.behospital_code like CONCAT('%',#{fileCode},'%')
+        </if>
+        <if test="hospitalId != null and hospitalId != ''">
+            and t1.hospital_id = #{hospitalId}
+        </if>
+        and t1.rep_no = t2.rep_no
         <if test="behospitalDate != null">
-            <![CDATA[ AND t1.check_date >= #{behospitalDate}]]>
+            <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') >= #{behospitalDate}]]>
         </if>
-        <if test="leaveHospitalDate != null">
-            <![CDATA[ AND t1.check_date <= #{leaveHospitalDate}]]>
+        <if test="isPlacefile != null and isPlacefile == 1">
+            <if test="leaveHospitalDate != null">
+                <![CDATA[AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') <= #{leaveHospitalDate}]]>
+            </if>
         </if>
     </select>
 

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -4,30 +4,31 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsResult">
-        <result column="rep_no" property="repNo" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="behospital_code" property="behospitalCode" />
-        <result column="rept_name" property="reptName" />
-        <result column="part" property="part" />
-        <result column="clinic_sight" property="clinicSight" />
-        <result column="rept_diag" property="reptDiag" />
-        <result column="remark" property="remark" />
-        <result column="clinic_diag" property="clinicDiag" />
-        <result column="apply_doctor" property="applyDoctor" />
-        <result column="checker_doctor" property="checkerDoctor" />
-        <result column="report_doctor" property="reportDoctor" />
-        <result column="dept_name" property="deptName" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
+        <result column="rep_no" property="repNo"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="rept_name" property="reptName"/>
+        <result column="part" property="part"/>
+        <result column="clinic_sight" property="clinicSight"/>
+        <result column="rept_diag" property="reptDiag"/>
+        <result column="remark" property="remark"/>
+        <result column="clinic_diag" property="clinicDiag"/>
+        <result column="apply_doctor" property="applyDoctor"/>
+        <result column="checker_doctor" property="checkerDoctor"/>
+        <result column="report_doctor" property="reportDoctor"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
     </resultMap>
-    <select id="getMedPacsResults" parameterType="com.diagbot.entity.BehospitalInfo" resultType="com.diagbot.entity.MedPacsResult">
+    <select id="getMedPacsResults" parameterType="com.diagbot.entity.BehospitalInfo"
+            resultType="com.diagbot.entity.MedPacsResult">
         SELECT
-        t1.rep_no,
-        t1.rep_name as reptName,
-        t1.dept_name,
+        t2.rep_no repNo,
+        t2.rept_name as reptName,
+        t2.dept_name,
         t1.part,
         t2.hospital_id,
         t2.behospital_code,
@@ -50,16 +51,23 @@
         t1.is_deleted = "N"
         AND t2.is_deleted = "N"
         AND t1.check_date IS NOT NULL
-        and t1.hospital_id = #{hospitalId}
         and t1.hospital_id = t2.hospital_id
         and t1.behospital_code = t2.behospital_code
-        and t1.behospital_code = #{behospitalCode}
-        and t2.rep_no in(t1.rep_no)
-        <if test="behospitalDate != null">
-            <![CDATA[ AND t1.check_date >= #{behospitalDate}]]>
+        <if test="fileCode != null and fileCode != ''">
+            and t1.behospital_code like CONCAT('%',#{fileCode},'%')
+        </if>
+        <if test="hospitalId != null and hospitalId != ''">
+            and t1.hospital_id = #{hospitalId}
         </if>
-        <if test="leaveHospitalDate != null">
-            <![CDATA[ AND t1.check_date <= #{leaveHospitalDate}]]>
+            and t1.rep_no = t2.rep_no
+        <if test="isPlacefile != null and isPlacefile == 1">
+            <if test="leaveHospitalDate != null">
+                <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') <= #{leaveHospitalDate}]]>
+            </if>
         </if>
+        <if test="behospitalDate != null">
+            <![CDATA[ AND date_format (t1.check_date,'%Y-%m-%d %H:%i:%s') >= #{behospitalDate}]]>
+        </if>
+
     </select>
 </mapper>