违规费用分析中的患者身份

src/main/java/thyyxxk/webserver/dao/his/reports/IllegalChargesAnalysisDao.java

@@ -89,9 +89,10 @@ public interface IllegalChargesAnalysisDao {
 
 
     @Select("<script>" +
-            "select rtrim(a.inpatient_no) inpatient_no,rtrim(a.name) name,a.admiss_times,a.admiss_date,b.dis_date,DATEDIFF(day,b.dis_date,a.admiss_date) differ_date," +
+            "select rtrim(a.inpatient_no) inpatient_no,rtrim(a.name) name,a.admiss_times," +
+            "a.admiss_date,b.dis_date,DATEDIFF(day,b.dis_date,a.admiss_date) differ_date," +
             "(select name from zd_unit_code where code=isnull(a.small_dept,a.admiss_dept)) dept_name," +
-            "a.responce_type " +
+            "responce_type_name = (select name from zy_zd_responce_type where a.responce_type = zy_zd_responce_type.code) " +
             "from zy_inactpatient a ,zy_inactpatient b " +
             "where a.inpatient_no=b.inpatient_no" +
             "  and a.admiss_times=b.admiss_times+1" +
@@ -129,7 +130,8 @@ public interface IllegalChargesAnalysisDao {
             "       dept_name   = (select rtrim(name) name from zd_unit_code where code = small_dept), " +
             "       admiss_date, " +
             "       dis_date, " +
-            "       differ_date = DATEDIFF(day, admiss_date, dis_date) " +
+            "       differ_date = DATEDIFF(day, admiss_date, dis_date)," +
+            "       responce_type_name = (select name from zy_zd_responce_type where responce_type = zy_zd_responce_type.code) " +
             "from zy_inactpatient " +
             "where DATEDIFF(day, admiss_date, dis_date) <= #{tianShu} " +
             "  and admiss_date >= #{startTime} " +

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllistupld/DiseinfoUpld.java

@@ -7,37 +7,38 @@ import java.io.Serializable;
 
 /**
  * 住院诊断信息
- * */
+ */
 @Data
 public class DiseinfoUpld implements Serializable {
     private static final long serialVersionUID = -5189444898990091574L;
     /**
      * 诊断类别
-     * */
+     */
     @JSONField(name = "diag_type")
     private String diagType;
-    
+
     /**
      * 诊断代码
-     * */
+     */
     @JSONField(name = "diag_code")
     private String diagCode;
-    
+
     /**
      * 诊断名称
-     * */
+     */
     @JSONField(name = "diag_name")
     private String diagName;
-    
+
     /**
      * 入院病情类型
-     * */
+     */
     @JSONField(name = "adm_cond_type")
     private String admCondType = "1";
-    
+
     /**
      * 主诊断标志
-     * */
+     */
     @JSONField(name = "maindiag_flag")
     private String maindiagFlag;
+
 }

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllistupld/MzChargitems.java

@@ -2,17 +2,26 @@ package thyyxxk.webserver.entity.medicalinsurance.setllistupld;
 
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 @Data
+@Accessors(chain = true)
 public class MzChargitems {
+    // 费用类别
     private String medChrgitmType;
+    // 总额
     private String detItemFeeSumamt;
-    private String fulamtOwnpayAmt;
+
+    // 甲类
     private String claaSumfee;
+    // 乙类
     private String clabAmt;
+    // 自费
+    private String fulamtOwnpayAmt;
+    // 其他
     private String othAmt;
 
     public String getMedChrgitm() {

src/main/java/thyyxxk/webserver/entity/reports/illegalchargesanalysis/IllegalChargeData.java

@@ -57,4 +57,8 @@ public class IllegalChargeData {
     private String disDiag;
 
     private String disDiagComment;
+
+    private String responceType;
+    private String responceTypeName;
+
 }