Browse Source

财务填报终版本

953954216 5 months ago
parent
commit
47559ba467

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCwxxTb.java

@@ -341,10 +341,10 @@ public class SysCwxxTb extends BaseEntity
     @NumberV(message = "{护理型床位}")
     private String hlxcw;
 
-    /** 年在院总人数 */
-    @Excel(name = "年在院总人数")
-    @ApiModelProperty(value = "年在院总人数")
-    @NumberV(message = "{年在院总人数}")
+    /** 年在院总人数 */
+    @Excel(name = "年在院总人数")
+    @ApiModelProperty(value = "年在院总人数")
+    @NumberV(message = "{年在院总人数}")
     private String nzyzrs;
 
     /** 年末在院总人数 */

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCwxxTbMapper.xml

@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         getxzqhmcbycode(szxzqh) as szxzqh_name,
         a.id as jg_id , a.jlrq djsj, a.tyshxydm tyxydm, a.jgmc dwmc, a.frxm fddbr, a.txdz dz, substring(a.ssxzqh,1,6) dwszdxzqhdm,
         a.frdjjg djbm, a.frlxfs dh, a.sczt bdlx, a.cwbj lx,
+
         ( case when SUBSTRING(dwxz,1,1) =3 then 10 when SUBSTRING(dwxz,1,1) =2 then 30 when dwxz =42 then 42  else null end) jglx,
         ( case when SUBSTRING(dwxz,1,1) =3 then 2 when SUBSTRING(dwxz,1,1) =2 then 1 when dwxz =42 then 3 else null	end	) xz,
         a.xbzt, a.yljgzyxkzh yljgzyxkzdjh, a.jzmj jgjzmj,
@@ -120,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  zylx not in ('11','99')) zyjsjnry,
         (select count(0) from yljg_yg_jbxx where jg_id = a.id and state = '1' and  zylx = '01') ylhly,
         a.cwzs nmcws, a.hlxcws hlxcw,
+--         ((select count(0) FROM yljg_kh_jbxx WHERE status = '0' AND is_qy = '1' AND is_rz = '1' AND  jg_id = a.id ) * FLOOR(182 + RAND() * (365 - 182 + 1))) nzyzrs,
+        CONVERT(((select count(0) FROM yljg_kh_jbxx WHERE status = '0' AND is_qy = '1' AND is_rz = '1' AND  jg_id = a.id ) * FLOOR(182 + RAND() * (365 - 182 + 1))),SIGNED) nzyzrs,
         (select count(0) FROM yljg_kh_jbxx WHERE status = '0' AND is_qy = '1' AND is_rz = '1' AND  jg_id = a.id ) nmzyzrs,
         (select count(0) FROM yljg_kh_jbxx WHERE status = '0' AND is_qy = '1' AND is_rz = '1' AND  jg_id = a.id AND  xb = '2') nmzynxrs,
         (select count(0) FROM yljg_kh_jbxx WHERE status = '0' AND is_qy = '1' AND is_rz = '1' AND  jg_id = a.id AND (is_tk = '1' or is_db = '1')) tkryjzgydx,

+ 1 - 1
ruoyi-ui/src/views/business/fwjggl/cwxxtb/index.vue

@@ -225,7 +225,7 @@ export default {
         },
         {
           label:'在院人数',child:[
-            {key:'nzyzrs',label:'年在院总人数',value:0},
+            {key:'nzyzrs',label:'年在院总人数',value:0},
             {key:'nmzyzrs',label:'年末在院总人数',value:0},
             {key:'nmzynxrs',label:'年末在院女性总人数',value:0},
           ]

+ 1 - 1
ruoyi-ui/src/views/organization/jggl/cwxxTb/index.vue

@@ -250,7 +250,7 @@
           },
           {
             label: '在院人数', child: [
-              { key: 'nzyzrs', label: '年在院总人数', value: 0 },
+              { key: 'nzyzrs', label: '年在院总人数', value: 0 },
               { key: 'nmzyzrs', label: '年末在院总人数', value: 0 },
               { key: 'nmzynxrs', label: '年末在院女性总人数', value: 0 }
             ]