1.出院浏览页面增加审核节点查询

2.查看病历清单页面增加文件标题、采集来源条件搜索，采集时间可升降序
3.病案统计列表增加出院人数统计
4.终审页面添加显示纸质病历是否签收状态、审核前判断是否已扫描纸质病历，未扫描前不能审核。
5.在节假日设置页面增加“终审时是否判断纸质病历是否扫描”开关
6.病案终审退回页面（已归档）增加查看流程功能

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

@@ -0,0 +1,24 @@
+package com.emr.controller;
+
+import com.emr.entity.Emr_Commom_Set;
+import com.emr.service.ipml.EmrCommomSetService;
+import com.emr.util.Msg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("commom/")
+public class CommomSetController {
+    @Autowired
+    private EmrCommomSetService commomSetService;
+
+    @RequestMapping(value="update",method = {RequestMethod.POST})
+    @ResponseBody
+    public Msg update(Emr_Commom_Set commomSet) throws Exception{
+        commomSetService.update(commomSet);
+        return Msg.success();
+    }
+}

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

@@ -5,11 +5,13 @@ import com.emr.dao.Emr_DictionaryMapper;
 import com.emr.entity.*;
 import com.emr.service.Archive_DetailService;
 import com.emr.service.Archive_MasterService;
+import com.emr.service.ipml.ArchiveFlowInfoService;
 import com.emr.service.ipml.ArchiveOtherService;
 import com.emr.service.ipml.TPrintinfoService;
 import com.emr.service.ipml.ZdAssortService;
 import com.emr.util.ExceptionPrintUtil;
 import com.emr.util.Msg;
+import com.emr.vo.ArchiveFlowInfoVo;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -56,6 +58,9 @@ public class FontController {
     private ZdAssortService assortService;
     @Autowired
     private ArchiveOtherService archiveOtherService;
+    @Autowired
+    private ArchiveFlowInfoService archiveFlowInfoService;
+
     @RequestMapping("selectIsPrintByPatienId")
     @ResponseBody
     public Msg selectIsPrintByPatienId(String patientId) throws Exception{
@@ -421,4 +426,17 @@ public class FontController {
             return null;
         }
     }
+
+    /**
+     * 根据masterId查询流程明细
+     * @param masterId
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("toShowFlowInfo")
+    @ResponseBody
+    public Msg toShowFlowInfo(String masterId) throws Exception{
+        List<ArchiveFlowInfoVo> list = archiveFlowInfoService.selectFlowInfoByMasterId(masterId);
+        return Msg.success().add("list",list);
+    }
 }

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

@@ -1,12 +1,15 @@
 package com.emr.controller;
 
+import com.emr.dao.Emr_Commom_SetMapper;
 import com.emr.entity.EmrHolidaySetVo;
+import com.emr.entity.Emr_Commom_Set;
 import com.emr.entity.OffsetLimitPage;
 import com.emr.service.ipml.HolidaySetService;
 import com.emr.util.ExceptionPrintUtil;
 import com.emr.util.Msg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -15,8 +18,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 public class HolidaySetController {
     @Autowired
     private HolidaySetService holidaySetService;
+    @Autowired
+    private Emr_Commom_SetMapper commomSetMapper;
     @RequestMapping("holidaySetList")
-    public String holidaySetList(){
+    public String holidaySetList(Model model){
+        Emr_Commom_Set obj = commomSetMapper.selectByPrimaryKey(1);
+        model.addAttribute("commomSet",obj);
         return "holidaySetDir/holidaySetList";
     }
 

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

@@ -10,6 +10,7 @@ import com.emr.entity.*;
 import com.emr.service.Archive_MasterService;
 import com.emr.service.Emr_Fault_DetailService;
 import com.emr.service.Emr_Fault_TypeService;
+import com.emr.service.ipml.Archive_DetailServiceImpl;
 import com.emr.util.ExceptionPrintUtil;
 import com.emr.util.ExportExcelUtil;
 import com.emr.util.Msg;
@@ -35,6 +36,9 @@ public class lastVerifyController {
     @Autowired
     private Emr_Fault_DetailService emrFaultDetailService;
 
+    @Autowired
+    private Archive_DetailServiceImpl archiveDetailService;
+
     @RequestMapping(value = "/lastVerifys")
     public String faults(){
         return "lastVerifyDir/lastVerifyList";
@@ -145,6 +149,15 @@ public class lastVerifyController {
         archiveMasterService.updateFiled(master);
         return Msg.success();
     }
+
+
+    @ResponseBody
+    @RequestMapping(value = "/selectIsScan")
+    public Msg selectIsScan(String ids) throws Exception{
+        ids = archiveDetailService.selectIsScan(ids);
+        return Msg.success().add("ids",ids);
+    }
+
 }
  
 

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

@@ -2,6 +2,7 @@ package com.emr.dao;
 
 import com.emr.entity.Archive_Detail;
 import com.emr.entity.Archive_Detail_Vo;
+import com.emr.entity.Archive_Master_Vo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -49,4 +50,6 @@ public interface Archive_DetailMapper {
     List<Archive_Detail> selectNotInspectionList(@Param("masterIds") String masterIds);
 
     List<Archive_Detail> getSourceByMasterId(@Param("masterid") String masterid);
+
+    List<Archive_Detail> selectIsScan(@Param("ids") String ids);
 }

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

@@ -0,0 +1,9 @@
+package com.emr.dao;
+
+import com.emr.entity.Emr_Commom_Set;
+
+public interface Emr_Commom_SetMapper {
+    Emr_Commom_Set selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(Emr_Commom_Set record);
+}

src/main/java/com/emr/entity/Emr_Commom_Set.java

@@ -0,0 +1,19 @@
+package com.emr.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Emr_Commom_Set {
+    private Integer id;
+    private Integer int1;
+    private Integer int2;
+    private Integer int3;
+    private String str1;
+    private String str2;
+    private String str3;
+    private Date date1;
+    private Date date2;
+    private Date date3;
+}

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

@@ -9,10 +9,7 @@ package com.emr.service;
 import com.emr.entity.Archive_Detail;
 import com.emr.entity.Archive_Detail_Vo;
 import com.emr.entity.OffsetLimitPage;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PathVariable;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.util.List;
@@ -85,6 +82,8 @@ public interface Archive_DetailService {
     void showPdf(HttpServletResponse response, HttpSession session, String pdfWater);
 
     List<Archive_Detail> getSourceByMasterId(String masterid);
+
+    String selectIsScan(String ids);
 }
  
 

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

@@ -40,8 +40,6 @@ public class ArchiveFlowInfoService {
     @Autowired
     private ArchiveFlowInfoMapper flowInfoMapper;
     @Autowired
-    private ArchiveFlowRoleMapper flowRoleMapper;
-    @Autowired
     private Archive_MasterMapper archiveMasterMapper;
     @Autowired
     private StatisticsService statisticsService;

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

@@ -7,9 +7,8 @@
 package com.emr.service.ipml;
 
 import com.emr.dao.Archive_DetailMapper;
-import com.emr.entity.Archive_Detail;
-import com.emr.entity.Archive_Detail_Vo;
-import com.emr.entity.OffsetLimitPage;
+import com.emr.dao.Emr_Commom_SetMapper;
+import com.emr.entity.*;
 import com.emr.service.Archive_DetailService;
 import com.emr.util.Jpg2PdfUtil;
 import com.github.pagehelper.Page;
@@ -19,7 +18,6 @@ import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
@@ -29,7 +27,8 @@ import java.util.List;
 public class Archive_DetailServiceImpl implements Archive_DetailService {
     @Autowired
     private Archive_DetailMapper archiveDetailMapper;
-
+    @Autowired
+    private Emr_Commom_SetMapper commomSetMapper;
 
     @Override
     public List<Archive_Detail_Vo> selectByClo(Archive_Detail_Vo record) {
@@ -203,6 +202,30 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
     public List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(String patientId, String assortIds) {
         return archiveDetailMapper.selectTypeTreeByPatientIdAndAssortIds(patientId, assortIds);
     }
+
+    @Override
+    public String selectIsScan(String ids) {
+        //判断是否需要判断纸质病历已扫描
+        Emr_Commom_Set commomSet = commomSetMapper.selectByPrimaryKey(1);
+        if(commomSet.getInt1() == 1){
+            StringBuilder idsStr = new StringBuilder();
+            //组织已经扫描上传的MasterId
+            List<Archive_Detail> list =  archiveDetailMapper.selectIsScan(ids);
+            if(!CollectionUtils.isEmpty(list)){
+                ids = "";
+                for (Archive_Detail obj: list ) {
+                    String masterid = obj.getMasterid();
+                    if(StringUtils.isBlank(idsStr)){
+                        idsStr.append(masterid);
+                    }else{
+                        idsStr.append(",").append(masterid);
+                    }
+                }
+                ids = idsStr.toString();
+            }
+        }
+        return ids;
+    }
 }
  
 

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

@@ -10,7 +10,9 @@ import com.emr.dao.*;
 import com.emr.entity.*;
 import com.emr.service.Archive_MasterService;
 import com.emr.service.Emr_Fault_DetailService;
+import com.emr.util.ExceptionPrintUtil;
 import com.emr.util.Msg;
+import com.emr.util.OracleConnect;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
@@ -198,14 +200,50 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public List<Archive_Master_Vo> selectLastVerifyList(Archive_Master_Vo archiveMasterVo){
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByLast(archiveMasterVo);
         if(null != list && !list.isEmpty()){
+            //记帐号集合
+            StringBuilder patientIdStr = new StringBuilder();
             for (Archive_Master_Vo masterVo : list) {
                 //状态均为护士长已质控，取出一个对象，转换中文状态
-                Integer status = Integer.valueOf(masterVo.getArchivestate());
+                /*Integer status = Integer.valueOf(masterVo.getArchivestate());
                 if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){
                     masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName());
                 }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){
                     masterVo.setStatus(EnumVerify.DocState.CallBacked.getName());
+                }*/
+                //组织记帐号集合
+                if(StringUtils.isNotBlank(masterVo.getPatientId())) {
+                    if (StringUtils.isNotBlank(patientIdStr)) {
+                        patientIdStr.append(",'").append(masterVo.getPatientId()).append("'");
+                    } else {
+                        patientIdStr.append("'").append(masterVo.getPatientId()).append("'");
+                    }
+                }
+            }
+            //赋值签收情况
+            //查询签收情况
+            String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" +
+                    "and  freg_date is not null";
+            try{
+                //执行查询
+                List<String> selectList = OracleConnect.selectList(sql);
+                for (Archive_Master_Vo masterVo : list) {
+                    masterVo.setStatus("未签收");
+                    //赋值
+                    if(!CollectionUtils.isEmpty(selectList)){
+                        String patientId = masterVo.getPatientId();
+                        if(StringUtils.isNotBlank(patientId)) {
+                            for (String str : selectList) {
+                                if(str.equals(patientId)){
+                                    masterVo.setStatus("已签收");
+                                    break;
+                                }
+                            }
+                        }
+                    }
                 }
+            }catch (Exception e){
+                e.printStackTrace();
+                ExceptionPrintUtil.printException(e);
             }
         }
         return list;
@@ -273,29 +311,29 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             List<Emr_Dictionary> dictionaries = dictionaryMapper.dicByTypeCode(dictionary);
             //查询出院天数
             List<Archive_Master_Vo> selectDays = archiveMasterMapper.selectDaysByMasterIds(list);
-            if(!CollectionUtils.isEmpty(dictionaries)){
-                for (Archive_Master_Vo vo:list) {
+            for (Archive_Master_Vo vo:list) {
+                if(!CollectionUtils.isEmpty(dictionaries)) {
                     //在院科室
                     String deptAdmissionTo = vo.getDeptAdmissionTo();
                     //出院科室
                     String deptName = vo.getDeptName();
                     //住院科室
-                    for (Emr_Dictionary dictionaryTemp:dictionaries) {
+                    for (Emr_Dictionary dictionaryTemp : dictionaries) {
                         String name = dictionaryTemp.getName();
-                        if(StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())){
+                        if (StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())) {
                             vo.setDeptAdmissionTo(name);
                         }
-                        if(StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())){
+                        if (StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())) {
                             vo.setDeptName(name);
                         }
                     }
-                    //赋值出院天数
-                    if(!CollectionUtils.isEmpty(selectDays)){
-                        for(Archive_Master_Vo days : selectDays){
-                            if(days.getId().equals(vo.getId())){
-                                vo.setDays(days.getDays());
-                                break;
-                            }
+                }
+                //赋值出院天数
+                if(!CollectionUtils.isEmpty(selectDays)){
+                    for(Archive_Master_Vo days : selectDays){
+                        if(days.getId().equals(vo.getId())){
+                            vo.setDays(days.getDays());
+                            break;
                         }
                     }
                 }

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

@@ -0,0 +1,17 @@
+package com.emr.service.ipml;
+
+import com.emr.dao.Emr_Commom_SetMapper;
+import com.emr.entity.Emr_Commom_Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class EmrCommomSetService {
+    @Autowired
+    private Emr_Commom_SetMapper commomSetMapper;
+    public void update(Emr_Commom_Set commomSet) {
+        commomSetMapper.updateByPrimaryKeySelective(commomSet);
+    }
+}

src/main/java/com/emr/util/OracleConnect.java

@@ -5,6 +5,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.alibaba.druid.pool.DruidDataSource;
 
@@ -28,10 +30,10 @@ public class OracleConnect {
             if (dataSourceTest == null) {
                 dataSourceTest = new DruidDataSource();
                 // 设置连接参数
-                dataSourceTest.setUrl("jdbc:oracle:thin:@192.168.10.6:1521/orc1");
+                dataSourceTest.setUrl("jdbc:oracle:thin:@200.100.100.1:1521/orc1");
                 dataSourceTest.setDriverClassName("oracle.jdbc.driver.OracleDriver");
-                dataSourceTest.setUsername("pacs");
-                dataSourceTest.setPassword("pacs");
+                dataSourceTest.setUsername("Jswzh");
+                dataSourceTest.setPassword("Jswzh");
                 dataSourceTest.setInitialSize(3);
                 dataSourceTest.setMaxActive(10);
             }
@@ -95,4 +97,17 @@ public class OracleConnect {
         OracleConnect.CloseConn(rs, pst, conn);
         return str;
     }
+    public static List<String> selectList(String arg0) throws Exception {
+        List<String> str = new ArrayList<>();
+        Connection conn = new OracleConnect().getConnect();
+        pst = conn.prepareStatement(arg0);
+        rs = pst.executeQuery();
+        if (rs != null) {
+            while (rs.next()) {
+                str.add(rs.getString(1));
+            }
+        }
+        OracleConnect.CloseConn(rs, pst, conn);
+        return str;
+    }
 }

src/main/resources/mapper/Archive_DetailMapper.xml

@@ -363,4 +363,20 @@
   <select id="getSourceByMasterId" resultMap="BaseResultMap">
     select Source from archive_detail where MasterID = ${masterid} group by Source
   </select>
+  <!--查询已扫描上传到masterId集合-->
+  <select id="selectIsScan" resultMap="BaseResultMap">
+      SELECT
+          MasterID
+      FROM
+          archive_detail
+      WHERE
+          MasterID IN (
+          <foreach collection="ids.split(',')" item="item" separator=",">
+               ${item}
+          </foreach>
+          )
+          AND Source = '扫描上传'
+      GROUP BY
+          MasterID
+  </select>
 </mapper>

src/main/resources/mapper/EmrCommomSetMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.emr.dao.Emr_Commom_SetMapper" >
+  <resultMap id="BaseResultMap" type="com.emr.entity.Emr_Commom_Set" >
+    <result column="id" jdbcType="NVARCHAR" property="id"/>
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, int1,int2,int3,str1,str2,str3,date1,date2,date3
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from emr_commom_set
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.Emr_Commom_Set" >
+    update emr_commom_set
+    <set >
+      <if test="int1 != null" >
+        int1 = #{int1,jdbcType=INTEGER},
+      </if>
+      <if test="int2 != null" >
+        int2 = #{int2,jdbcType=INTEGER},
+      </if>
+      <if test="int3 != null" >
+        int3 = #{int3,jdbcType=INTEGER},
+      </if>
+      <if test="str1 != null" >
+        str1 = #{str1,jdbcType=NVARCHAR},
+      </if>
+      <if test="str2 != null" >
+        str2 = #{str2,jdbcType=NVARCHAR},
+      </if>
+      <if test="str3 != null" >
+        str1 = #{str3,jdbcType=NVARCHAR},
+      </if>
+      <if test="date1 != null" >
+        date1 = #{date1,jdbcType=TIMESTAMP},
+      </if>
+      <if test="date2 != null" >
+        date2 = #{date2,jdbcType=TIMESTAMP},
+      </if>
+      <if test="date3 != null" >
+        date3 = #{date3,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -680,7 +680,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-09-04"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-09-11"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/WEB-INF/views/holidaySetDir/holidaySetList.jsp

@@ -90,6 +90,16 @@
                 </div>
             </form>
             <hr>
+            <div class="form-inline">
+                <div class="form-group">
+                    <label>终审时是否判断已扫描纸质病历:</label>
+                    <div class="input-daterange input-group">
+                        <input type="checkbox" class="week" value="1" style="margin:0" id="setIsScan" <c:if test="${commomSet.int1==1}">checked</c:if>/>
+                    </div>
+                    <button style="margin-left: 15px" type="button" class="btn btn-primary btn-sm" id="saveCommomSet">保存修改</button>
+                </div>
+            </div>
+            <hr>
             <form style="margin-bottom: 0!important;">
                 <div class="form-inline">
                     <div class="form-group divCss8">
@@ -138,5 +148,5 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-08-28"></script>
+<script src="${path}/static/js/holidaySet/holidaySetList.js?time=2020-09-11"></script>
 </html>

src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp

@@ -446,7 +446,7 @@
 <script type="text/javascript">
     var path = "${path}";
 </script>
-<script src="${path}/static/js/inHospList/inHospList.js?time=2020-09-04"></script>
+<script src="${path}/static/js/inHospList/inHospList.js?time=2020-09-11"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
 </html>

src/main/webapp/WEB-INF/views/index.jsp

@@ -350,7 +350,7 @@
     </div>
     <footer class="main-footer">
         <div class="pull-right">
-            <b>Version</b> 20200821
+            <b>Version</b> 20200911
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -622,8 +622,8 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-04"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
+<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-11"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp

@@ -140,5 +140,5 @@
 <script>
     var path = "${path}";
 </script>
-<script src="${path}/static/js/recallDateList/recallDateList.js?time=2020-08-18"></script>
+<script src="${path}/static/js/recallDateList/recallDateList.js?time=2020-09-11"></script>
 </html>

src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp

@@ -217,6 +217,22 @@
         </div>
     </div>
 </div>
+<%--查看流程弹窗--%>
+<div class="modal fade" id="showFlowInfo" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content modal-contentHigh">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title">查看流程</h4>
+            </div>
+            <div class="modal-body">
+                <iframe id="showFlowInfoIframe" width="100%" height="100%" scrolling="yes"></iframe>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
-<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-08-18"></script>
+<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-09-11"></script>
 </html>

src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp

@@ -57,7 +57,7 @@
             <form style="margin-top:5px;margin-bottom: 0!important;">
                 <div class="form-inline">
                     <div class="form-group divCss8">
-                        <label>审核日期:</label>
+                        <label>终审日期:</label>
                         <div class="input-group">
                             <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
                                    maxlength="10" autocomplete="off"/>

src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp

@@ -593,6 +593,6 @@
     var path = "${path}";
 </script>
 <script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-09-04"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/static/js/holidaySet/holidaySetList.js

@@ -300,3 +300,20 @@ $(document).keydown(function (event) {
         searchNode();
     }
 });
+
+$("#saveCommomSet").click(function(){
+    var checked = $("#setIsScan").prop('checked');
+    $.ajax({
+        type:'post',
+        url:path+"/commom/update",
+        data:{id:1,int1:checked == true ? 1 : 0},
+        dateType:'json',
+        success:function(data){
+            if(data.code == 100){
+                toastr.success("保存修改成功");
+            }else{
+                toastr.error(data.msg);
+            }
+        }
+    })
+})

src/main/webapp/static/js/lastVerifyList/lastVerifyList.js

@@ -131,17 +131,26 @@ function initTable() {
                     align: 'left'
                 },
                 {
-                    title: '状态',
+                    title: '纸质状态',
                     field: 'status',
                     align: 'center',
                     valign: 'middle',
                     formatter: function (value, row) {
+                        var overTimeStr = '';
+                        //超期
                         if (row.days > 0) {
-                            a = '<span style="color:red">(超期)</span><span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
-                        } else {
-                            a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            overTimeStr = '<span style="color:red">(超期)</span>';
+                        }
+                        var colorStr = ''
+                        if(value == '已签收'){
+                            colorStr = '#8FBC8F';
+                        }else if(value == '未签收'){
+                            colorStr = 'red';
+                        }else{
+                            value = '';
                         }
-                        return a;
+                        var str = '<span style="color:'+colorStr+'"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        return overTimeStr+str;
                     }
                 },
                 {
@@ -411,16 +420,45 @@ $("#sureBtn").on('click',function(){
 
 //调用审批diag
 function callApproveDiag(ids,count) {
-    $('#verifyModal').modal({
-        backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-        keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-        show: true//弹出对话框
-    });
-    $("#archiveId").val(ids);
-    $("#status1").val("64");
-    $("#verifyText").val("");
-    //审批个数
-    $("#approveCount").val(count);
+    //判断是否有扫描纸质
+    $.ajax({
+        type:'get',
+        url:path+'/lastVerify/selectIsScan',
+        data:{ids:ids},
+        dataType:'json',
+        success:function(data){
+            if(data.code == 100){
+                var ids = data.extend.ids;
+                if(ids != ''){
+                    $('#verifyModal').modal({
+                        backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                        keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                        show: true//弹出对话框
+                    });
+                    $("#archiveId").val(ids);
+                    $("#status1").val("64");
+                    $("#verifyText").val("");
+                    //审批个数
+                    //组织selects
+                    debugger
+                    var idsList = ids.split(",");
+                    for (var i = 0; i < selects.length; i++) {
+                        for (var j = 0; j < idsList.length; j++) {
+                            if(selects[i].id == idsList[j]){
+                                return ;
+                            }
+                        }
+                        selects.splice(i,1);
+                    }
+                    $("#approveCount").val(idsList.length);
+                }else{
+                    toastr.warning("纸质病历未扫描上传,请先扫描上传")
+                }
+            }else{
+                toastr.error(data.msg);
+            }
+        }
+    })
 }
 
 //查看初审信息

src/main/webapp/static/js/medicalRecallList/medicalRecallList.js

@@ -207,18 +207,36 @@ function initTable() {
                     formatter: function (value, row, index) {
                         var url = window.location.href;
                         var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+                        var temp = '';
                         if (index != null && index != "" && index.indexOf("recall") != -1) {
                             if(row.status=="已召回"){
-                                return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\','+row.patientId+')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\''+row.id+'\')">日志</button>';
+                                temp =  '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\','+row.patientId+')">召回 </button>' + '<button class="btn btn-danger btn-sm" onclick="logFun(\''+row.id+'\')">日志</button>';
                             }else{
                                 if(row.updater != '1') {
-                                    return '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',' + row.patientId + ')">召回 </button>';
+                                    temp = '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',' + row.patientId + ')">召回 </button>';
                                 }
                             }
-                            return '';
+                            temp += '<button type="button" class="btn btn-sm btn-success showFlowInfo" title="查看流程">查看流程</button>';
+                            return temp;
                         }
 
                     },
+                    events: {
+                        //查看流程
+                        'click .showFlowInfo': function (e, value, row) {
+                            $('#showFlowInfo').modal({
+                                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                                show: true//弹出对话框
+                            });
+                            var masterId = row.id;
+                            var name = encodeURI(row.name);
+                            var inpNo = row.inpNo;
+                            var visitId = row.visitId;
+                            var dischargeDateTime = row.dischargeDateTime;
+                            $("#showFlowInfoIframe").prop("src",path+"/beHosp/toShowFlowInfo?id="+masterId+"&name="+name+"&inpNo="+inpNo+"&visitId="+visitId+"&dischargeDateTime="+dischargeDateTime+"&role=4");
+                        }
+                    },
                     cellStyle: function (value, row, index) {
                         return {classes: 'success'}
                     }