chengyao 4 gadi atpakaļ
vecāks
revīzija
6f5b0053f0

+ 1 - 1
src/main/java/com/diagbot/entity/HomePage.java

@@ -89,7 +89,7 @@ public class HomePage implements Serializable {
     private Date birthday;
 
     /**
-     * 年龄
+     * 年龄(拼接年龄单位)
      */
     private String age;
 

+ 1 - 0
src/main/java/com/diagbot/vo/ExportQcresultVO.java

@@ -31,6 +31,7 @@ public class ExportQcresultVO {
     private String radioCheck = "1";
     @ApiModelProperty(hidden = true)
     private Long userId;
+    private Long deptId;
     /**
      * 主诊断
      */

+ 2 - 2
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5213,7 +5213,7 @@
     <select id="getAge" resultType="java.util.Map">
         SELECT
         a.behospital_code as behospitalCode,
-        CONCAT( ifnull(c.age,'') ,ifnull(c.age_unit,'') )as age
+        CONCAT( ifnull(a.age,'') ,ifnull(a.age_unit,'') )as age
         FROM
         med_home_page a
         WHERE
@@ -9387,7 +9387,7 @@
             AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND c.`level` = #{qcResultShortPageVO.level}
+            AND b.`level` = #{qcResultShortPageVO.level}
         </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )