修复确认医嘱收费的bug 和 完成科室收入统计

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>10.1.5</version>
+    <version>10.1.6</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/zhuyuanyiji/QueRenYiZhuShouFeiController.java

@@ -6,8 +6,6 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
 import thyyxxk.webserver.service.zhuyuanyiji.QueRenYiZhuShouFeiServer;
 
-import java.util.List;
-
 /**
  * <p>
  * 描述： 确认医嘱收费
@@ -31,9 +29,9 @@ public class QueRenYiZhuShouFeiController {
     }
 
     @GetMapping("/getXuQueFeiXiangXiXinXi")
-    public ResultVo<List<YzActOrder>> getXuQueFeiXiangXiXinXi(@RequestParam("inpatientNo") String inpatientNo,
-                                                              @RequestParam("admissTimes") Integer admissTimes,
-                                                              @RequestParam("execUnit") String execUnit) {
+    public ResultVo<YzActOrder> getXuQueFeiXiangXiXinXi(@RequestParam("inpatientNo") String inpatientNo,
+                                                        @RequestParam("admissTimes") Integer admissTimes,
+                                                        @RequestParam("execUnit") String execUnit) {
         return server.getXuQueFeiXiangXiXinXi(inpatientNo, admissTimes, execUnit);
     }
 

src/main/java/thyyxxk/webserver/controller/zhuyuanyiji/YiJiFeiYongLuRuController.java

@@ -6,12 +6,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.entity.yibao.ZyActpatient;
 import thyyxxk.webserver.service.zhuyuanyiji.YiJiFeiYongLuRuServer;
 
-import java.util.List;
-
 /**
  * <p>
  * 描述： 医技科室的项目录入
@@ -38,11 +35,5 @@ public class YiJiFeiYongLuRuController {
         return server.getHuanZheXinXi(inpatientNo, zaiYuanChuYuan, admissTimes);
     }
 
-    @GetMapping("/getHuanZheFeiYong")
-    public ResultVo<List<ZyDetailCharge>> getHuanZheFeiYong(@RequestParam("inpatientNo") String inpatientNo,
-                                                            @RequestParam("admissTimes") Integer admissTimes,
-                                                            @RequestParam("dept") String dept,
-                                                            @RequestParam("chargeCode") String chargeCode) {
-        return server.getHuanZheFeiYong(inpatientNo, admissTimes, dept, chargeCode);
-    }
+ 
 }

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -24,7 +24,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
 
     @Select("<script>" +
             "SELECT a.admiss_times,      " +
-            "            a.inpatient_no,      " +
+            "       a.inpatient_no, " +
+            "       a.order_no," +
+            "       a.gen_time,     " +
             "            a.ledger_sn,  " +
             "            a.detail_sn,  " +
             "            a.charge_date,  " +
@@ -84,7 +86,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
 
     @Select("<script>" +
             "SELECT a.admiss_times,      " +
-            "       a.inpatient_no,   " +
+            "       a.inpatient_no," +
+            "       a.order_no,   " +
+            "       a.gen_time,     " +
             "       a.ledger_sn,   " +
             "       a.detail_sn,   " +
             "       a.charge_date,   " +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/QueRenYiZhuShouFeiDao.java

@@ -24,98 +24,80 @@ public interface QueRenYiZhuShouFeiDao {
     List<String> getKeShiLieBiao(String deptCode);
 
     @Select("<script>" +
-            "SELECT a.inpatient_no,   " +
-            "       a.admiss_times,   " +
-            "       name     =b.name,   " +
-            "       bed_no   =b.bed_no,   " +
-            "       ward_name = (select rtrim(name) name from zd_unit_code where zd_unit_code.code = a.ward_code),   " +
-            "       b.sex,   " +
-            "       b.admiss_date,   " +
-            "       b.total_charge,   " +
-            "       responce_type ,   " +
-            "       responce_type_name=(select rtrim(name) name from zy_zd_responce_type where responce_type = zy_zd_responce_type.code),   " +
-            "       a.ward_code,exec_unit   " +
-            "FROM yz_zy_patient_fee a ,zy_actpatient b   " +
-            "where a.charge_status='3' and   " +
-            "<if test=\"inpatientNo !=null and inpatientNo != '' \">      " +
-            "a.inpatient_no = #{inpatientNo} and   " +
-            "</if>" +
-            "<if test=\"admissTimes !=null and admissTimes != '' \">" +
-            "      a.admiss_times = #{admissTimes} and   " +
-            "</if>" +
-            "<if test=\"execUnit != null and execUnit !='' and execUnit != '3100000'\">" +
-            "      a.exec_unit    in " +
+            "SELECT a.inpatient_no, " +
+            "       a.admiss_times, " +
+            "       bed_no   =b.bed_no, " +
+            "       b.name, " +
+            "       a.ward_code , " +
+            "       ward_name = (select name from zd_unit_code where code = ward_code) " +
+            "FROM yz_zy_patient_fee a ,zy_actpatient b " +
+            "where    a.charge_status='3' and " +
+            "         a.exec_unit    in" +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
-            "  #{item}" +
+            "    #{item}  " +
             "</foreach>" +
-            " and   " +
-            "</if>" +
-            "<if test=\"wardCode != null and wardCode !='' \">" +
-            "      a.ward_code    =    #{wardCode} and   " +
-            "</if>" +
-            "      a.inpatient_no=b.inpatient_no and   " +
-            "      a.admiss_times=b.admiss_times and  " +
-            "      convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
-            "group by a.inpatient_no, a.admiss_times, b.name, b.bed_no,a.ward_code,exec_unit,b.sex,b.admiss_date,b.total_charge,responce_type" +
+            "      and   a.inpatient_no=b.inpatient_no and " +
+            "         a.admiss_times=b.admiss_times " +
+            "         and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
+            "group by a.inpatient_no, a.admiss_times, b.bed_no, b.name, a.ward_code " +
+            "order by ward_code" +
             "</script>")
     IPage<YzActOrder> getXuQueFeiYiZhu(IPage<YzActOrder> page,
-                                       @Param("inpatientNo") String inpatientNo,
-                                       @Param("admissTimes") Integer admissTimes,
-                                       @Param("execUnit") String execUnit,
-                                       @Param("wardCode") String wardCode,
                                        @Param("list") List<String> list);
 
+
+    /**
+     * 获取需要确认医嘱收费的总数
+     *
+     * @param list 科室集合
+     * @return 返回信息
+     */
+    @Select("<script>" +
+            "select count(*) from (" +
+            "SELECT a.inpatient_no, " +
+            "       a.admiss_times, " +
+            "       bed_no   =b.bed_no, " +
+            "       b.name, " +
+            "       a.ward_code , " +
+            "       ward_name = (select name from zd_unit_code where code = ward_code) " +
+            "FROM yz_zy_patient_fee a ,zy_actpatient b " +
+            "where    a.charge_status='3' and " +
+            "         a.exec_unit    in" +
+            "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
+            "    #{item}  " +
+            "</foreach>" +
+            "      and   a.inpatient_no=b.inpatient_no and " +
+            "         a.admiss_times=b.admiss_times " +
+            "         and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
+            "group by a.inpatient_no, a.admiss_times, b.bed_no, b.name, a.ward_code" +
+            ") temp" +
+            "</script>")
+    long getXuQueFeiYiZhuTotal(@Param("list") List<String> list);
+
+
+    @Select("select inpatient_no,admiss_times,bed_no,sex,admiss_date,responce_type, " +
+            "ledger_sn = (select max(ledger_sn) from zy_ledger_file where zy_ledger_file.inpatient_no = zy_actpatient.inpatient_no " +
+            "and zy_ledger_file.admiss_times = zy_actpatient.admiss_times), " +
+            "responce_type_name = (select rtrim(name) from zy_zd_responce_type where code = responce_type),  " +
+            "total_charge from zy_actpatient where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} ")
+    YzActOrder huoQuGeRenXinXi(@Param("inpatientNo") String inpatientNo,
+                               @Param("admissTimes") Integer admissTimes);
+
     @Select("<script>" +
-            "SELECT a.inpatient_no,  " +
-            "       a.admiss_times,  " +
-            "       a.charge_date,  " +
-            "       a.op_id_code,  " +
-            "       a.charge_code,  " +
-            "       a.infant_flag,  " +
-            "       a.charge_status,  " +
-            "       a.charge_fee,  " +
-            "       a.self_flag,  " +
-            "       a.separate_flag,  " +
-            "       a.suppress_flag,  " +
-            "       a.occ_time,  " +
-            "       a.act_order_no,  " +
-            "       a.dept_code,  " +
-            "       a.ward_code,  " +
-            "       ward_name = (select rtrim(name) name from zd_unit_code where zd_unit_code.code =  a.ward_code)," +
-            "       a.order_count,  " +
-            "       a.pay_self,  " +
-            "       a.exec_unit,  " +
-            "       a.zy_serial_no  ,  " +
-            "       charge_name=c.name,  " +
-            "       bill_item_code=c.bill_item_zy,  " +
-            "       ledger_sn=b.times_billed,  " +
-            "       name     =b.name,  " +
-            "       bed_no   =b.bed_no,  " +
-            "       op_flag  =isnull(a.op_flag,'0'),  " +
-            "       d.order_name,  " +
-            "       docotr_name=e.name,  " +
-            "       op_id = a.op_id,  " +
-            "       op_date = a.op_date  " +
-            "FROM yz_zy_patient_fee a ,zy_actpatient b ,zd_charge_item c,yz_act_order d,a_employee_mi e  " +
-            "where    a.charge_status='3' and  " +
-            "         a.inpatient_no = #{inpatientNo} and  " +
-            "         a.admiss_times = #{admissTimes} and " +
-            "<if test=\"execUnit != null and execUnit !='' and execUnit != '3100000'\">" +
-            "      a.exec_unit    in " +
+            "select a.charge_status,e.name docotr_name,a.act_order_no,c.name order_name,a.charge_code,a.charge_fee,a.order_count,occ_time " +
+            "from yz_zy_patient_fee a ,zd_charge_item c,yz_act_order d,a_employee_mi e " +
+            "where a.inpatient_no = #{inpatientNo} and a.admiss_times = #{admissTimes} and " +
+            "a.charge_status = '3' and " +
+            "a.charge_code=c.code  and " +
+            "a.inpatient_no=d.inpatient_no and " +
+            "a.admiss_times=d.admiss_times  and " +
+            "a.act_order_no=d.act_order_no  and " +
+            "d.physician*=e.code  and " +
+            "convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) and " +
+            "a.exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
-            "  #{item}" +
+            "    #{item}  " +
             "</foreach>" +
-            " and   " +
-            "</if>" +
-            "         a.inpatient_no=b.inpatient_no and  " +
-            "         a.admiss_times=b.admiss_times and  " +
-            "         a.charge_code=c.code  and" +
-            "         a.inpatient_no=d.inpatient_no and " +
-            "         a.admiss_times=d.admiss_times  and" +
-            "         a.act_order_no=d.act_order_no  and" +
-            "         d.physician*=e.code  and" +
-            "         convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23)  " +
-            "order by charge_name,order_code,charge_code" +
             "</script>")
     List<YzActOrder> getXuQueFeiXiangXiXinXi(@Param("inpatientNo") String inpatientNo,
                                              @Param("admissTimes") Integer admissTimes,
@@ -129,7 +111,7 @@ public interface QueRenYiZhuShouFeiDao {
             " charge_status = #{item.chargeStatus}, op_id = #{code}, op_date = GETDATE() " +
             "</set>" +
             "WHERE act_order_no = #{item.actOrderNo} " +
-            "AND inpatient_no = #{inpatientNo} AND admiss_times = #{admissTimes}" +
+            "AND inpatient_no = #{inpatientNo} AND admiss_times = #{admissTimes} and occ_time = #{item.occTime} " +
             "</foreach>" +
             "</script>")
     void baoCunYiZhuQueFei(@Param("inpatientNo") String inpatientNo,

src/main/java/thyyxxk/webserver/service/querydata/KeShiShouRuServer.java

@@ -16,10 +16,7 @@ import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -50,8 +47,9 @@ public class KeShiShouRuServer {
         }
 
         KeShiFeiiYongTongJi qp = new KeShiFeiiYongTongJi();
-        log.info("查询科室收费统计 ==> 执行科室：{},开始{},结束：{}。项目编码：{}，录入人：{}，申请科室：{}", param.getExecUnit(), param.getStartTime(), param.getEndTime(),
-                param.getChargeCodeMx(), param.getOpId(), param.getReqDeptCode());
+        log.info("查询科室收费统计 ==> 执行科室：{},开始{},结束：{}。项目编码：{}，录入人：{}，申请科室：{},总数：{}，当前页：{}，页大小：{}",
+                param.getExecUnitList(), param.getStartTime(), param.getEndTime(),
+                param.getChargeCodeMx(), param.getOpId(), param.getReqDeptCode(), param.getTotal(), param.getCurrentPage(), param.getPageSize());
         List<String> keShiLieBiao = publicServer.getKeShiLieBiaoList(param.getExecUnitList());
         GetDropdownBox renHuanCodeHeCodeRs = new GetDropdownBox();
         if (StringUtil.notBlank(param.getOpId())) {
@@ -140,6 +138,8 @@ public class KeShiShouRuServer {
                 xiangMuSet.add(item.getChargeCodeMx());
                 luRuRenSet.add(item.getOpIdCode());
             });
+
+
             Map<String, String> huanZheXingMingMap = dao.huanZheXingMing(huanZheHaoSet, huanZheBiao)
                     .stream()
                     .collect(Collectors.toMap(GetDropdownBox::getCode, GetDropdownBox::getName, (key1, key2) -> key1));
@@ -188,8 +188,17 @@ public class KeShiShouRuServer {
     }
 
     public void exportExcel(HttpServletResponse response, QueryDrugsAndProjects param) {
-        List<KeShiFeiiYongTongJi> keShiFeiiYongTongJisList = getKeShouFei(param).getData().getData();
-        String[] title = null;
+        double pageSize = 1000;
+        double currentPage = param.getTotal() / pageSize;
+        int fenDuan = (int) Math.ceil(currentPage);
+        List<KeShiFeiiYongTongJi> keShiFeiiYongTongJisList = new ArrayList<>();
+        param.setPageSize(1000);
+        for (long i = 0; i < fenDuan; i++) {
+            param.setCurrentPage(i);
+            keShiFeiiYongTongJisList.addAll(getKeShouFei(param).getData().getData());
+        }
+
+        String[] title;
         if (param.getFenLei() == 3) {
             title = new String[]{"患者姓名", "住院/门诊号", "次数", "项目编码", "项目名称", "收费日期", "录入人", "执行科室", "申请科室", "金额", "数量", "来源"};
         } else {
@@ -211,12 +220,12 @@ public class KeShiShouRuServer {
                 content[i][8] = pojo.getWardCodeName();
                 content[i][9] = pojo.getChargeFee().toString();
                 content[i][10] = pojo.getChargeAmount().toString();
-                content[i][9] = pojo.getSource();
+                content[i][11] = pojo.getSource();
             } else {
                 content[i][0] = param.getFenLei() == 0 ? pojo.getChargeDateString() : param.getFenLei() == 1 ? pojo.getOpName() : pojo.getChargeCodeName();
-                content[i][1] = pojo.getPatient();
-                content[i][2] = pojo.getTimes().toString();
-                content[i][3] = pojo.getChargeCodeMx();
+                content[i][1] = pojo.getChargeFee().toString();
+                content[i][2] = pojo.getChargeAmount().toString();
+                content[i][3] = pojo.getSource();
             }
         }
         ExcelUtil.exportExcel(response, title, content);

src/main/java/thyyxxk/webserver/service/zhuyuanyiji/QueRenYiZhuShouFeiServer.java

@@ -49,14 +49,13 @@ public class QueRenYiZhuShouFeiServer {
      * @return 返回分页数据
      */
     public ResultVo<IPage<YzActOrder>> getXuQueFeiYiZhu(YzActOrder yzActOrder) {
-        IPage<YzActOrder> page = new Page<>(yzActOrder.getCurrentPage(), yzActOrder.getPageSize());
-        //  yzActOrder.setInpatientNo(publicServer.getInpatientNo(yzActOrder.getInpatientNo()));
+        IPage<YzActOrder> page = new Page<>(yzActOrder.getCurrentPage(), yzActOrder.getPageSize(), false);
         if (StringUtil.isBlank(yzActOrder.getExecUnit())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "科室信息为空 [・_・?]");
         }
         log.info("查询需确费医嘱：数据：{}", JSON.toJSONString(yzActOrder));
-        dao.getXuQueFeiYiZhu(page, yzActOrder.getInpatientNo(), yzActOrder.getAdmissTimes(), yzActOrder.getExecUnit(),
-                yzActOrder.getWardCode(), publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit()));
+        page.setTotal(dao.getXuQueFeiYiZhuTotal(publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit())));
+        dao.getXuQueFeiYiZhu(page, publicServer.getKeShiLieBiaoList(yzActOrder.getExecUnit()));
         if (page.getRecords().isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
@@ -71,13 +70,14 @@ public class QueRenYiZhuShouFeiServer {
      * @param execUnit    执行科室
      * @return 返回
      */
-    public ResultVo<List<YzActOrder>> getXuQueFeiXiangXiXinXi(String inpatientNo, Integer admissTimes, String execUnit) {
-        List<YzActOrder> list = dao.getXuQueFeiXiangXiXinXi(inpatientNo, admissTimes, execUnit, publicServer.getKeShiLieBiaoList(execUnit));
-        System.out.println(publicServer.getKeShiLieBiaoList(execUnit));
-        if (list.isEmpty()) {
+    public ResultVo<YzActOrder> getXuQueFeiXiangXiXinXi(String inpatientNo, Integer admissTimes, String execUnit) {
+        YzActOrder yzActOrder = dao.huoQuGeRenXinXi(inpatientNo, admissTimes);
+        log.info("查询确认医嘱费用明细 ==> 住院号：{}，住院次数：{}，执行科室：{}", inpatientNo, admissTimes, execUnit);
+        yzActOrder.setList(dao.getXuQueFeiXiangXiXinXi(inpatientNo, admissTimes, execUnit, publicServer.getKeShiLieBiaoList(execUnit)));
+        if (yzActOrder.getList() == null || yzActOrder.getList().isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有数据 ヽ(゜Q。)ノ？");
         }
-        return ResultVoUtil.success(list);
+        return ResultVoUtil.success(yzActOrder);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -92,7 +92,7 @@ public class QueRenYiZhuShouFeiServer {
             if (StringUtil.isBlank(yzActOrder.getChargeStatus())) {
                 return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER);
             }
-            if (yzActOrder.getChargeStatus().equals("5")) {
+            if (yzActOrder.getChargeStatus().equals("1")) {
                 ZyDetailCharge zy = new ZyDetailCharge();
                 zy.setChargeAmount(yzActOrder.getOrderCount());
                 zy.setChargeFee(yzActOrder.getChargeFee());
@@ -100,7 +100,7 @@ public class QueRenYiZhuShouFeiServer {
                 zyDetailCharges.add(zy);
                 sum = sum.add(zy.getChargeAmount().multiply(zy.getChargeFee()));
                 shangChuanList.add(yzActOrder);
-            } else if (yzActOrder.getChargeStatus().equals("7")) {
+            } else if (yzActOrder.getChargeStatus().equals("2")) {
                 yzActOrder.setOccTimeString(DateUtil.formatDatetime(yzActOrder.getOccTime()));
                 shangChuanList.add(yzActOrder);
             }
@@ -108,7 +108,6 @@ public class QueRenYiZhuShouFeiServer {
         if (shangChuanList.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有选择任何操作 !!!∑(ﾟДﾟノ)ノ");
         } else {
-            log.info("测试：{}", JSON.toJSONString(shangChuanList));
             dao.baoCunYiZhuQueFei(param.getInpatientNo(), param.getAdmissTimes(), shangChuanList, TokenUtil.getTokenUserId());
         }
         if (!zyDetailCharges.isEmpty()) {

src/main/java/thyyxxk/webserver/service/zhuyuanyiji/YiJiFeiYongLuRuServer.java

@@ -5,14 +5,11 @@ import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.dao.his.zhuyuanyiji.YiJiFeiYongLuRuDao;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.entity.yibao.ZyActpatient;
 import thyyxxk.webserver.service.PublicServer;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
-import java.util.List;
-
 /**
  * <p>
  * 描述： 住院医技项目录入
@@ -68,22 +65,4 @@ public class YiJiFeiYongLuRuServer {
         return ResultVoUtil.success(zyActpatient);
     }
 
-    /**
-     * 获取患者费用
-     *
-     * @param inpatientNo 住院号
-     * @param admissTimes 住院次数
-     * @param dept        科室
-     * @param chargeCode  项目编码
-     * @return 返回是由医技录入的信息
-     */
-    public ResultVo<List<ZyDetailCharge>> getHuanZheFeiYong(String inpatientNo, Integer admissTimes, String dept, String chargeCode) {
-        log.info("查询患者的费用==》住院号：{}，住院次数：{}，科室：{}，项目编码：{}", inpatientNo, admissTimes, dept, chargeCode);
-        List<ZyDetailCharge> list = dao.getHuanZheFeiYong(inpatientNo, admissTimes, dept, chargeCode);
-        if (list.isEmpty()) {
-            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
-        }
-        return ResultVoUtil.success(list);
-    }
-
 }