开发已打印标识

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

@@ -45,7 +45,7 @@ public class TempHandleWzController {
     @RequestMapping("selectByInpNoAndVisitId")
     @ResponseBody
     public List<Archive_Master_Vo> selectByInpNoAndVisitId(Archive_Master_Vo archive_master_vo){
-        return this.archiveMasterService.selectByUnfile(archive_master_vo);
+        return this.archiveMasterService.selectByUnfileAndColumn(archive_master_vo,null,null);
     }
 
     @RequestMapping("reloadWz")

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

@@ -75,7 +75,7 @@ public class VCountController {
         //文件名
         String fileName = "未归档病历列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list = archiveMasterService.selectByUnfile(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByUnfileAndColumn(archiveMasterVo,null,null);
         Emr_Dictionary dic = new Emr_Dictionary();
         dic.setEffective(1);
         dic.setTypecode("dept_code");

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

@@ -63,7 +63,7 @@ public class commitController {
         //文件名
         String fileName = "科主任审核" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list = archiveMasterService.selectByCmtCol(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByCmtByColumn(archiveMasterVo,null,null);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
         String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
 

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

@@ -86,7 +86,7 @@ public class lastVerifyController {
         //文件名
         String fileName = "病案室终审" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list = archiveMasterService.selectByLast(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByLastByColumn(archiveMasterVo,null,null);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
         String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
     }

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

@@ -213,7 +213,7 @@ public class signListController {
         //文件名
         String fileName = "病案室终审" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list = archiveMasterService.selectByLast(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByLastByColumn(archiveMasterVo,null,null);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
         String result = utils.exportExcelToFilePath(response, utils.listConvert(list));
     }

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

@@ -57,7 +57,7 @@ public class unfileMedicalController {
         //文件名
         String fileName = "未归档病历列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
-        List<Archive_Master_Vo> list = archiveMasterService.selectByUnfile(archiveMasterVo);
+        List<Archive_Master_Vo> list = archiveMasterService.selectByUnfileAndColumn(archiveMasterVo,null,null);
         ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames);
         String result=utils.exportExcelToFilePath(response,utils.listConvert(list));
     }

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

@@ -39,14 +39,6 @@ public interface Archive_MasterService {
      */
     List<Archive_Master> selectByCol(Archive_Master_Vo archiveMasterVo);
 
-    /**
-     * 根据条件查找病案终审列表分页
-     *
-     * @param archiveMasterVo
-     * @return
-     */
-    List<Archive_Master_Vo> selectByLast(Archive_Master_Vo archiveMasterVo);
-
     /**
      * 根据条件查找'归档中','复审退回'病案列表
      *
@@ -56,13 +48,6 @@ public interface Archive_MasterService {
     List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo);
 
 
-    /**
-     * 根据条件查找病案未归档列表分页
-     *
-     * @param archiveMasterVo
-     * @return
-     */
-    List<Archive_Master_Vo> selectByUnfile(Archive_Master_Vo archiveMasterVo);
     /**
      * 根据条件查找病案未归档列表分页，除了已归档状态的记录
      *
@@ -77,14 +62,6 @@ public interface Archive_MasterService {
      */
    // List<Archive_Master> sel7DayByCol(Archive_Master_Vo record);
 
-    /**
-     * 根据条件查找'归档中','主任复审退回'病案列表
-     *
-     * @param archiveMasterVo
-     * @return
-     */
-    List<Archive_Master_Vo> selectByCmtCol(Archive_Master_Vo archiveMasterVo);
-
     /**
      * 根据条件查找病案'归档中','审核退回'列表分页
      *
@@ -116,6 +93,13 @@ public interface Archive_MasterService {
      * @return
      */
     OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
+    /**
+     * 根据条件查找病案终审列表分页
+     *
+     * @param archiveMasterVo
+     * @return
+     */
+    List<Archive_Master_Vo> selectByLastByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit);
 
     /**
      * 根据条件查找病案'归档中','主任审核退回'列表分页
@@ -226,6 +210,17 @@ public interface Archive_MasterService {
     List<Archive_Master>  selectByObject(String patientId,String visitId);
 
     void requestObservationRecord(String inpatientNo, String status,String reason);
+
+    /**
+     * 根据条件查找'归档中','主任复审退回'病案列表
+     * @param archiveMasterVo
+     * @param offset
+     * @param limit
+     * @return
+     */
+    List<Archive_Master_Vo> selectByCmtByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit);
+
+    List<Archive_Master_Vo> selectByUnfileAndColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit);
 }
  
 

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

@@ -63,7 +63,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Master> list= archiveMasterMapper.selectByCol(archiveMasterVo);
-
         JSONArray powerUsers = powerUserService.getPowerUserList("1");
         List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
         if (powerUserList != null){
@@ -72,24 +71,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 public String apply(JSONObject temp) {
                     return temp.getString("userName");
                 }});
-
-            for (Archive_Master archive_master : list) {
-
-                JSONObject userInfo = mappedMovies.get(archive_master.getDoctorName());
+            for (Archive_Master archiveMaster : list) {
+                JSONObject userInfo = mappedMovies.get(archiveMaster.getDoctorName());
                 if (userInfo==null){
-                    archive_master.setDoctorName(archive_master.getDoctorName());
+                    archiveMaster.setDoctorName(archiveMaster.getDoctorName());
                 }else {
-                    archive_master.setDoctorName(userInfo.getString("name"));
+                    archiveMaster.setDoctorName(userInfo.getString("name"));
                 }
 
-                userInfo = mappedMovies.get(archive_master.getNurseName());
+                userInfo = mappedMovies.get(archiveMaster.getNurseName());
                 if (userInfo==null){
-                    archive_master.setNurseName(archive_master.getNurseName());
+                    archiveMaster.setNurseName(archiveMaster.getNurseName());
                 }else {
-                    archive_master.setNurseName(userInfo.getString("name"));
+                    archiveMaster.setNurseName(userInfo.getString("name"));
                 }
             }
-
         }
         return new OffsetLimitPage((Page) list);
     }
@@ -104,11 +100,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         return archiveMasterMapper.selectByColumn(archiveMasterVo);
     }
 
-    @Override
-    public List<Archive_Master_Vo> selectByUnfile(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectByUnfile(archiveMasterVo);
-    }
-
    /*   @Override
     public List<Archive_Master> selectByUnfile2(Archive_Master_Vo archiveMasterVo) {
         return archiveMasterMapper.selectByUnfile2(archiveMasterVo);
@@ -120,13 +111,17 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     }*/
 
     @Override
-    public List<Archive_Master_Vo> selectByCmtCol(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectByCmtCol(archiveMasterVo);
-    }
-
-    @Override
-    public List<Archive_Master_Vo> selectByLast(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectByLast(archiveMasterVo);
+    public List<Archive_Master_Vo> selectByLastByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit) {
+        //判断并设置查询是否打印权限
+        setIdByPrintNum(archiveMasterVo);
+        //根据条件查询记录
+        if(null != offset && null != limit) {
+            PageHelper.offsetPage(offset, limit);
+        }
+        List<Archive_Master_Vo> list = archiveMasterMapper.selectByLast(archiveMasterVo);
+        //设置医生、护士名称和打印标识
+        setNameAndPrintFlag(archiveMasterVo, list);
+        return list;
     }
 
     @Override
@@ -136,7 +131,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     }
 
     /**
-     * 根据是否打印设置id
+     * 判断并设置查询是否打印权限
      * @param archiveMasterVo
      */
     private void setIdByPrintNum(Archive_Master_Vo archiveMasterVo){
@@ -161,12 +156,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public List<Archive_Master_Vo> selectBeHospitalByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+        //判断并设置查询是否打印权限
         setIdByPrintNum(archiveMasterVo);
         //根据条件查询记录
         if(null != offset && null != limit) {
             PageHelper.offsetPage(offset, limit);
         }
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByColumn(archiveMasterVo);
+        //设置医生、护士名称和打印标识
+        setNameAndPrintFlag(archiveMasterVo, list);
+        return list;
+    }
+
+    /**
+     * 设置医生、护士名称和打印标识
+     * @param archiveMasterVo
+     * @param list
+     */
+    private void setNameAndPrintFlag(Archive_Master_Vo archiveMasterVo, List<Archive_Master_Vo> list) {
         if(!CollectionUtils.isEmpty(list)) {
             //查询用户集合
             JSONArray powerUsers = powerUserService.getPowerUserList("1");
@@ -227,7 +234,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 }
             }
         }
-        return list;
     }
 
     /**
@@ -267,28 +273,33 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
-        PageHelper.offsetPage(offset, limit);
-        List<Archive_Master_Vo> list = archiveMasterMapper.selectByUnfileNew(archiveMasterVo);
-        //设置医生和护士姓名
-        setDoctorAndNurseName(list);
+        List<Archive_Master_Vo> list = selectByUnfileAndColumn(archiveMasterVo,offset,limit);
         return new OffsetLimitPage((Page) list);
     }
 
+    @Override
+    public List<Archive_Master_Vo> selectByUnfileAndColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit) {
+        //判断并设置查询是否打印权限
+        setIdByPrintNum(archiveMasterVo);
+        //根据条件查询记录
+        if(null != offset && null != limit) {
+            PageHelper.offsetPage(offset, limit);
+        }
+        List<Archive_Master_Vo> list = archiveMasterMapper.selectByUnfileNew(archiveMasterVo);
+        //设置医生、护士名称和打印标识
+        setNameAndPrintFlag(archiveMasterVo, list);
+        return list;
+    }
+
     @Override
     public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
-        PageHelper.offsetPage(offset, limit);
-        List<Archive_Master_Vo> list = archiveMasterMapper.selectByLast(archiveMasterVo);
-        //设置医生和护士姓名
-        setDoctorAndNurseName(list);
+        List<Archive_Master_Vo> list = selectByLastByColumn(archiveMasterVo, offset, limit);
         return new OffsetLimitPage((Page) list);
     }
 
     @Override
     public OffsetLimitPage selectByCmtCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
-        PageHelper.offsetPage(offset, limit);
-        List<Archive_Master_Vo> list = archiveMasterMapper.selectByCmtCol(archiveMasterVo);
-        //设置医生和护士姓名
-        setDoctorAndNurseName(list);
+        List<Archive_Master_Vo> list = selectByCmtByColumn(archiveMasterVo, offset, limit);
         return new OffsetLimitPage((Page) list);
     }
 
@@ -430,6 +441,20 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             log.error(errorStr);
         }
     }
+
+    @Override
+    public List<Archive_Master_Vo> selectByCmtByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+        //判断并设置查询是否打印权限
+        setIdByPrintNum(archiveMasterVo);
+        //根据条件查询记录
+        if(null != offset && null != limit) {
+            PageHelper.offsetPage(offset, limit);
+        }
+        List<Archive_Master_Vo> list = archiveMasterMapper.selectByCmtCol(archiveMasterVo);
+        //设置医生、护士名称和打印标识
+        setNameAndPrintFlag(archiveMasterVo, list);
+        return list;
+    }
 }
  
 

src/main/resources/config/jdbc.properties

@@ -1,79 +1,60 @@
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#jdbc.url=jdbc:sqlserver://120.27.212.36:1433;databaseName=emr_recode_test
-jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=zj_record_new
+jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
+#jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
 jdbc.username=sa
-jdbc.password=docus702
+jdbc.password=docus@702
 #hibernate config
 hibernate.dialect=org.hibernate.dialect.SQLServerDialect
 hibernate.show_sql=true
 hibernate.format_sql=true
 hibernate.hbm2ddl.auto=update
 #hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
-hibernate.current_session_context_class=thread  
-hibernate.jdbc.batch_size=50  
-hibernate.enable_lazy_load_no_trans=true  
-
-
-//oracle连接需要的所有信息，实际直接写死在mybatis-config。xml中
-//驱动
-#driverClass="oracle.jdbc.OracleDriver";
-//地址
-#url="jdbc:oracle:thin:@10.6.0.150:1521:jhemr";
-//用户名
-#username="jswzh";
-//密码
-#password="jswzh123";
-
+hibernate.current_session_context_class=thread
+hibernate.jdbc.batch_size=50
+hibernate.enable_lazy_load_no_trans=true
 #图片地址
-pictureUrl=D:\\test\\uploadImage
+pictureUrl=Z:\\test\\uploadImage
 #本地自动生成PDF地址D:\tesst\autoPdf
 autoPdfUrl=D:/test/autoPdf
 #本地上传PDF地址
-pdfUrl=D:\\test\\loadPdf
+pdfUrl=Z:\\test\\loadPdf
 #PDF文件不存在或损坏列表地址
-pdfErrorUrl=D:\\test\\error\\
+pdfErrorUrl=Z:\\test\\error\\
 #超期天数
 expired=7
 #死亡超期天数
 deathExpired=7
-#定时清空（每天4点触发0 0 4 * * ?）:本地自动生成PDF地址autoPdfUrl及PDF文件不存在或损坏列表地址
-fileDelay=0 0 4 * * ?
-#定时重置完整性信息 :每天3点触发0 0 3 * * ?,每1秒执行一次0/1 * *  * * ? [秒] [分] [小时] [日] [月] [周] [年]
-fixedDelay=0 0 3 * * ?
 
 
-#权限系统端口8080
-powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
-POWER_URLHEAD=http://127.0.0.1:8080/power
-POWER_JSP=http://127.0.0.1:8080/power
+#原因
 recallReason=医院需要这份文档
-HomepageDictionary=http://127.0.0.1:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
+#权限系统接口
+powerUrl=http://10.6.1.127:8080/power/font/getMenusByUserIdAndSysFlag
+POWER_URLHEAD=http://10.6.1.127:8080/power
+POWER_JSP=http://10.6.1.127:8080/power
+
+#完整性接口
+HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
 HomepageMethod=CheckData
-powerGetUserList=http://127.0.0.1:8080/power/font/getUserList?userName=admin
 
-#powerUrl=http://127.0.0.1:9999/power/font/getMenusByUserIdAndSysFlag
-#POWER_URLHEAD=http://127.0.0.1:9999/power
-#POWER_JSP=http://127.0.0.1:9999/power
-#recallReason=医院需要这份文档
-#HomepageDictionary=http://127.0.0.1:9999/WholeCheckInterface/services/HomepageDictionary?wsdl
-#HomepageMethod=CheckData
-#powerGetUserList=http://127.0.0.1:8080/power/font/getUserList?userName=admin
+powerGetUserList=http://10.6.1.127:8080/power/font/getUserList?userName=admin
 
-#接口
 EMRQualityControl=http://10.6.0.170:57772/csp/healthshare/jhipnew/JHIPLIB.SOAP.BS.XmlService.cls?CfgItem=JH5003MRAtoEMR
 EMRQualityControlParamName=Message
 
-allAddortIds = 00000000
-pdfWater = \u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662
-
-#查看文件夹下pdf是否损坏
-#PdfIsError = Z:\\upload_01\\loadPdf
-PdfIsError = D:\\test070802
-
-
-
-
+#定时清空（每天4点触发0 0 4 * * ?）:本地自动生成PDF地址autoPdfUrl及PDF文件不存在或损坏列表地址
+fileDelay=0 0 4 * * ?
+#定时重置完整性信息 :每天3点触发0 0 3 * * ?,每1秒执行一次0/1 * *  * * ?
+fixedDelay=0 0 3 * * ?
 
+allAddortIds = 00000000
 
+#pdf\u6C34\u5370
+pdfWater = \u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662
 
+#菜单接口http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
+#powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
+#POWER_URLHEAD=http://120.27.212.36:8888/power
+#power权限系统的服务器地址头如：http://192.168.1.3:8081/power
 
+PdfIsError = D:\\test070802

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -426,8 +426,19 @@
     on m.id=printTable.MasterID
     where 1=1 and ArchiveState in('初审')
     and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
-    <if test="id != null and id != ''">
-      and m.id = #{id,jdbcType=NVARCHAR}
+    <if test="printNum != null and printNum != ''">
+      and m.id
+      <choose>
+        <when test="printNum == 1">
+          in
+        </when>
+        <otherwise>not in</otherwise>
+      </choose>
+      (
+      <foreach collection="id.split(',')" item="item" separator=",">
+        #{item}
+      </foreach>
+      )
     </if>
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
@@ -689,8 +700,19 @@
     where 1=1
     and patindex('%B%',m.inp_no) in (0,1)
     and m.ArchiveState not in('作废','已封存') and inp_no not like 'LG%'
-    <if test="id != null and id != ''">
-      and m.id = #{id,jdbcType=NVARCHAR}
+    <if test="printNum != null and printNum != ''">
+      and m.id
+      <choose>
+        <when test="printNum == 1">
+          in
+        </when>
+        <otherwise>not in</otherwise>
+      </choose>
+      (
+      <foreach collection="id.split(',')" item="item" separator=",">
+        #{item}
+      </foreach>
+      )
     </if>
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
@@ -818,8 +840,19 @@
     on m.id=printTable.MasterID
     where 1=1 and ArchiveState in('提交','主任退回','归档中','复审退回')
     and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
-    <if test="id != null and id != ''">
-      and m.id = #{id,jdbcType=NVARCHAR}
+    <if test="printNum != null and printNum != ''">
+      and m.id
+      <choose>
+        <when test="printNum == 1">
+          in
+        </when>
+        <otherwise>not in</otherwise>
+      </choose>
+      (
+      <foreach collection="id.split(',')" item="item" separator=",">
+        #{item}
+      </foreach>
+      )
     </if>
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'

src/main/webapp/WEB-INF/views/commitDir/commitList.jsp

@@ -462,6 +462,14 @@
                 <label>床号:</label>
                 <input type="text" class="input-sm form-control" id="bedNumber" placeholder="请输入床号">
             </div>
+            <div class="form-group divCss2">
+                <label>是否打印:</label>
+                <select class="input-sm form-control" id="printNum">
+                    <option value="">全部</option>
+                    <option value="1">已打印</option>
+                    <option value="0">未打印</option>
+                </select>
+            </div>
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
             <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
             <button type="button" class="btn btn-warning btn-sm divCss" id="excelBtn2">当前科室归档</button>
@@ -3135,8 +3143,8 @@
                         deptName: deptName.toString(),
                         startDateTo: $("#startDateTo").val(),
                         endDateTo: $("#endDateTo").val(),
-                        bedNumber: $("#bedNumber").val()
-
+                        bedNumber: $("#bedNumber").val(),
+                        printNum:$("#printNum").val()
                     };
                     return temp;
                 },
@@ -3148,7 +3156,7 @@
                     checkbox: true,
                     width: 25,
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
 
                 }, {
                     title: '病案清单id',
@@ -3475,6 +3483,20 @@
                             }
                             return result
                         }
+                    },{
+                        title: '是否打印',
+                        field: 'printNum',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var printNum = row.printNum;
+                            var html = '';
+                            if (printNum == '未打印') {
+                                html = '<span style="color:green"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            } else {
+                                html = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            }
+                            return html;
+                        }
                     }, {
                         title: '状态',
                         field: 'archivestate',
@@ -3668,7 +3690,7 @@
                             },
                             'click .selInfo': function (e, value, row, index) {
                                 $("#printTableFlag").hide();
-                                if(row.printNum!=0){
+                                if (row.printNum == '已打印') {
                                     $("#printTableFlag").show();
                                 }
                                 //实时获取完整性
@@ -4395,11 +4417,10 @@
         var endDateTo = $("#endDateTo").val();
         var bedNumber = $("#bedNumber").val();
         var idNo= $("#idNo").val();
-
+        var printNum = $("#printNum").val();
         window.location.href = "${path}/commCtr/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName + "&archivestate=" + archivestate+ "&idNo=" + idNo
-            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&bedNumber=" + bedNumber;
-
+            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&bedNumber=" + bedNumber + "&printNum=" + printNum;
     });
 
 

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

@@ -501,6 +501,14 @@
                                 <option value="0">否</option>
                             </select>
                         </div>
+                        <div class="form-group divCss8" style="margin-top: 10px" title="是否打印">
+                            <label>是否打印:</label>
+                            <select class="selectpicker bla bla bli" id="printNum">
+                                <option value="">全部</option>
+                                <option value="1">已打印</option>
+                                <option value="0">未打印</option>
+                            </select>
+                        </div>
                     <%--<div class="form-group divCss2">--%>
                     <%--<label for="archivestate">归档状态:</label>--%>
                     <%--<select class="input-sm form-control" id="archivestate">--%>
@@ -3256,7 +3264,8 @@
                         /*signer: "" + $("#signer").val(),*/
                         startSignDate: $("#startSignDate").val(),
                         endSignDate: $("#endSignDate").val(),
-                        isSign: $("#isSign").val()
+                        isSign: $("#isSign").val(),
+                        printNum:$("#printNum").val()
                     };
                     return temp;
                 },
@@ -3743,6 +3752,20 @@
                             }
                             return a;
                         }
+                    },{
+                        title: '是否打印',
+                        field: 'printNum',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var printNum = row.printNum;
+                            var html = '';
+                            if (printNum == '未打印') {
+                                html = '<span style="color:green"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            } else {
+                                html = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            }
+                            return html;
+                        }
                     },
                     {
                         title: '初审人',
@@ -4761,6 +4784,7 @@
         // } else {
         //     deptName = $("#deptName").val();
         // }
+        var printNum = $("#printNum").val();
         var deptName = $("#deptName").val();
         if (deptName.indexOf("") != -1) {
             deptName = "";
@@ -4781,7 +4805,7 @@
         window.location.href = "${path}/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName  + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
             + "&isscaned=" + isscaned + "&isSign=" + isSign + "&signer=" + signer+ "&startSignDate=" + startSignDate
-            + "&endSignDate=" + endSignDate+ "&idNo=" + idNo+ "&isScanning=" + isScanning;
+            + "&endSignDate=" + endSignDate+ "&idNo=" + idNo+ "&isScanning=" + isScanning + "&printNum=" + printNum;
 
     });
 

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

@@ -595,6 +595,14 @@
                     <option value="1">是</option>
                 </select>
             </div>
+            <div class="form-group divCss">
+                <label>是否打印:</label>
+                <select class="input-sm form-control" id="printNum">
+                    <option value="">全部</option>
+                    <option value="1">已打印</option>
+                    <option value="0">未打印</option>
+                </select>
+            </div>
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
             <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
 
@@ -2918,7 +2926,8 @@
                         startDate: $("#startDate").val(),
                         endDate: $("#endDate").val(),
                         bedNumber: $("#bedNumber").val(),
-                        deathFlag: $("#deathFlag").val()
+                        deathFlag: $("#deathFlag").val(),
+                        printNum:$("#printNum").val()
                     };
 
                     return temp;
@@ -3337,6 +3346,20 @@
                             }
                             return result;
                         }
+                    },{
+                        title: '是否打印',
+                        field: 'printNum',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var printNum = row.printNum;
+                            var html = '';
+                            if (printNum == '未打印') {
+                                html = '<span style="color:green"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            } else {
+                                html = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>'+printNum+'</span>';
+                            }
+                            return html;
+                        }
                     },
                     {
                         title: '科主任是否审核',
@@ -3431,7 +3454,7 @@
                         }, events: {
                             'click .selInfo': function (e, value, row, index) {
                                 $("#printTableFlag").hide();
-                                if(row.printNum!=0){
+                                if (row.printNum == '已打印') {
                                     $("#printTableFlag").show();
                                 }
                                 //实时获取完整性
@@ -4019,7 +4042,6 @@
         // } else {
         //     deptName = $("#deptName").val();
         // }
-
         var deptName = $("#deptName").val();
         if (deptName.indexOf("") != -1) {
             deptName = "";
@@ -4039,10 +4061,11 @@
         var endDate = $("#endDate").val();
         var bedNumber = $("#bedNumber").val();
         var deathFlag = $("#deathFlag").val();
+        var printNum = $("#printNum").val();
         window.location.href = "${path}/unfile/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo + "&archivestate=" + archivestate
             + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&startDate=" + startDate + "&endDate=" + endDate
-            + "&bedNumber=" + bedNumber + "&deathFlag=" + deathFlag;
+            + "&bedNumber=" + bedNumber + "&deathFlag=" + deathFlag + "&printNum=" + printNum;
     });
 
     var zNodes = [];