Merge branch 'dev_nursing_records_20230214' into dev_ch_master

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -234,7 +234,6 @@ and organ.SRV_ORGAN_ID = #{req.srvOrganId} order by detail.SRV_DATE desc
         to_char(d.ACCOUNTS_START_TIME,'yyyy-MM-dd') accountsStartTime,
         to_char(d.ACCOUNTS_END_TIME,'yyyy-MM-dd') accountsEndTime,
         to_char(d.ACCOUNTS_TIME,'yyyy-MM') accountsTime,
-        emp.EMP_NAME empName,
         d.ACCOUNTS_ALL_COST accountsAllCost,
         d.ACCOUNTS_OVERALL_COST accountsOverallCost,
         d.ACCOUNTS_PERSONAL_COST accountsPersonalCost,
@@ -250,7 +249,6 @@ and organ.SRV_ORGAN_ID = #{req.srvOrganId} order by detail.SRV_DATE desc
         left join  CH_DISABLE_APPLY apply on info.APPLY_ID=apply.APPLY_ID
         left join CH_SRV_ORGAN  o on d.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         LEFT JOIN CH_FND_ORGAN t3 ON o.ORGAN_ID = t3.ORGAN_ID
-        left join ch_srv_organ_emp emp on d.emp_id = emp.emp_id
         <where>
         1=1
         <if test="accountsId != null and  accountsId != ''">

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/AccountExportDetailListResp.java

@@ -25,8 +25,8 @@ public class AccountExportDetailListResp {
     @Excel(name = "失能人员",width = 20)
     private String realName;
 
-    @Excel(name = "护理人员",width = 20)
-    private String empName;
+   /* @Excel(name = "护理人员",width = 20)
+    private String empName;*/
     /**
      * 结算月份
      */