查看详情复选框修改

src/main/java/com/emr/controller/beHospitaledController.java

@@ -163,13 +163,10 @@ public class beHospitaledController {
 
 
     @ResponseBody
-    @RequestMapping(value = "/beHospList1")
+    @RequestMapping(value = "/beHospListTwo")
     public OffsetLimitPage beHospList1(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch,HttpServletRequest request){
-        //判断是否是初始化查询，是初始化查询把开始结束时间置空
-            archiveMasterVo.setStartDateTo(null);
-            archiveMasterVo.setEndDateTo(null);
         try {
-            return archiveMasterService.selectByColumn(archiveMasterVo, offset, limit,request);
+            return archiveMasterService.selectByColumnTwo(archiveMasterVo, offset, limit,request);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             e.printStackTrace();

src/main/java/com/emr/dao/Archive_MasterMapper.java

@@ -22,6 +22,8 @@ public interface Archive_MasterMapper {
 
     List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo record);
 
+    List<Archive_Master_Vo> selectStatisColumn(Archive_Master_Vo record);
+
     List<Archive_Master_Vo> selectByLast(Archive_Master_Vo record);
 
     List<Archive_Master_Vo> selectByUnfile(Archive_Master_Vo record);

src/main/java/com/emr/service/Archive_MasterService.java

@@ -58,6 +58,16 @@ public interface Archive_MasterService {
     OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request);
 
 
+    /**
+     * 统计列表二级列表查询
+     *
+     * @param archiveMasterVo
+     * @return
+     */
+    OffsetLimitPage selectByColumnTwo(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request);
+
+    List<Archive_Master_Vo> selectStatisColumn(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo, HttpServletRequest request);
+
     /**
      * 根据条件查找未归档列表分页
      *

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -88,6 +88,58 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         return new OffsetLimitPage((Page) list);
     }
 
+
+    /**
+     * 出院列表
+     * */
+    @Override
+    public OffsetLimitPage selectByColumnTwo(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) {
+        //设置查询条件审核角色
+        setInfoId(archiveMasterVo);
+        //设置登录用户
+        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+        if(user.getRoleId() != -100 && user.getRoleId() != 0){
+            archiveMasterVo.setUserName(user.getUserName());
+        }
+        List<Archive_Master_Vo> list = selectStatisColumn(offset, limit,archiveMasterVo,request);
+        return new OffsetLimitPage((Page) list);
+    }
+
+    @Override
+    public List<Archive_Master_Vo> selectStatisColumn(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo, HttpServletRequest request) {
+        List<Archive_Master_Vo> list = null;
+        if(null != offset && null != limit) {
+            PageHelper.offsetPage(offset, limit);
+        }
+       list = archiveMasterMapper.selectStatisColumn(archiveMasterVo);
+        selectByColumnChange(list);
+        List<ArchiveFlowRole> flowRoles = flowRoleMapper.selectAll();
+        //计算属于哪种审核角色
+        Msg role = getRole();
+        if(null != role) {
+            for (Archive_Master_Vo masterVo : list) {
+                String archivestate = masterVo.getArchivestate();
+                if (StringUtils.isNotBlank(archivestate)) {
+                    //转换中文状态
+                    boolean numeric = isNumeric(archivestate);
+                    if (numeric) {
+                        Integer status = Integer.valueOf(archivestate);
+                        //组织已经审核的状态
+                        archivestate = EnumVerify.DocState.GetStepName(status, role.getCode());
+                        //组织未审核的状态
+                        String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode());
+                        masterVo.setStatus(archivestate);
+                        masterVo.setCurrentStatus(currentArchivestate);
+                        //根据角色
+                        //获取审核按钮和退回按钮集合
+                        getBtns(status, flowRoles, masterVo.getId(), masterVo.getPatientId(), masterVo);
+                    }
+                }
+            }
+        }
+    return list;
+    }
+
     /**
      * //循环遍历list集合判断是否完整，完整isCheck赋值1，且批量更新LockInfo字段为完整
      * @param list
@@ -296,15 +348,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 for (Archive_Master_Vo masterVo : list) {
                     String archivestate = masterVo.getArchivestate();
                     String inpNo = masterVo.getPatientId();
-                    String sql = "SELECT FISZH FROM  V_JSWZH_EMR_CALLBACK  WHERE JZH='"+inpNo+"'";
-                    try {
-                        String select = OracleConnect.select(sql);
-                        masterVo.setHisStatic(select);
-//                        String hisStatic = masterVo.getHisStatic();
-                    } catch (Exception e) {
-                        ExceptionPrintUtil.printException(e);
-                        e.printStackTrace();
-                    }
+//                    String sql = "SELECT FISZH FROM  V_JSWZH_EMR_CALLBACK  WHERE JZH='"+inpNo+"'";
+//                    try {
+//                        String select = OracleConnect.select(sql);
+//                        masterVo.setHisStatic(select);
+////                        String hisStatic = masterVo.getHisStatic();
+//                    } catch (Exception e) {
+//                        ExceptionPrintUtil.printException(e);
+//                        e.printStackTrace();
+//
                     if (StringUtils.isNotBlank(archivestate)) {
                         //转换中文状态
                         boolean numeric = isNumeric(archivestate);
@@ -327,6 +379,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         return list;
     }
 
+
+
+
+
+
     /**
      * 带完整性查询的出院记录查询
      * @param archiveMasterVo

src/main/resources/config/spring-shiro.xml

@@ -21,6 +21,7 @@
                 /font/**=anon
                 /login=anon
                 /static/**=anon
+                /statistics/**=anon
                 /jspf/**=anon
                 /img/**=anon
                 /styles/**=anon

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -699,6 +699,25 @@
         ORDER BY archive_master.discharge_date_time desc
     </select>
 
+
+    <select id="selectStatisColumn" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
+        select * from  archive_master <where>
+        discharge_date_time != '1801-02-03 00:00:00.000'
+		  AND  discharge_date_time is not NULL
+        <if test="deptName!= null and deptName!= ''">
+            and dept_name in (${deptName})
+        </if>
+        <if test="startDateTo != null and startDateTo != ''">
+            and discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+        </if>
+        <if test="endDateTo != null and endDateTo != ''">
+            and discharge_date_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+        </if>
+    </where>
+        ORDER BY archive_master.discharge_date_time desc
+    </select>
+
+
     <!--终审-->
     <select id="selectByLast" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
         select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,

src/main/webapp/static/js/vCount/vCountList.js

@@ -788,7 +788,7 @@ function initTable() {
 //第二层，按科室分组查
 function initTable1(row) {
     $("#table1").bootstrapTable({ // 对应table标签的id
-        url: path + "/beHosp/beHospList1", // 获取表格数据的url
+        url: path + "/beHosp/beHospListTwo", // 获取表格数据的url
         cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
         striped: true,  //表格显示条纹，默认为false
         pagination: true, // 在表格底部显示分页组件，默认false

src/test/java/com/emr/Test.java

@@ -0,0 +1,48 @@
+package com.emr;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+public class Test {
+    public static void main(String[] args) {
+        createXml("1234");
+    }
+    /*
+    * <Request>
+    <Header>
+    <SourceSystem>HIS</SourceSystem>
+    <MessageId>D561C89A-6320-4b27-83DE-A6169B1D0761</MessageId>
+    <CreateTime>2021-07-18 11:12:41</CreateTime>
+    <MethodName>Get360PatientId</MethodName>
+    </Header>
+    <Body>
+    <PatientId>0000623132</PatientId>
+    </Body>
+    </Request>
+    * */
+    public static void createXml(String patientId){
+        try {
+            Document document = DocumentHelper.createDocument();
+            org.dom4j.Element request = document.addElement("Request");
+            org.dom4j.Element header = request.addElement("Header");
+            org.dom4j.Element sourceSystem = header.addElement("SourceSystem");
+            org.dom4j.Element messageId = header.addElement("MessageId");
+            org.dom4j.Element createTime = header.addElement("CreateTime");
+            org.dom4j.Element methodName = header.addElement("MethodName");
+            sourceSystem.setText("record");
+            messageId.setText(UUID.randomUUID().toString().toUpperCase());
+            createTime.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            methodName.setText("Get360PatientId");
+            org.dom4j.Element patientIdEle = request.addElement("PatientId");
+            patientIdEle.setText(patientId);
+            System.out.println(document);
+        } catch (Exception e) {
+            System.out.println("生成rssNew.xml失败");
+        }
+    }
+}