归档系统终审界面查询条件加上是否有缺陷、急诊留观病历做归档报表，与归档系统归档报表相同、急诊留观病历退回时没有发退回原因给留观病历

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

@@ -36,6 +36,12 @@ public class VCountController {
 
     @RequestMapping(value = "/vCounts")
     public String faults(Model model){
+        model.addAttribute("isLg",0);
+        return "vCountDir/vCountList";
+    }
+    @RequestMapping(value = "/vCountsLg")
+    public String faultsLg(Model model){
+        model.addAttribute("isLg",1);
         return "vCountDir/vCountList";
     }
 

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

@@ -74,8 +74,8 @@ public class beHospitaledController {
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印","状态"};
-        String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtNurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum","archivestate"};
+        String[] header = {"住院号","住院次数","姓名","性别","床号","出院科室","出院日期","归档医生是否提交","医生","医生提交日期","归档护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否打印","是否缺陷","状态"};
+        String[] fileNames = {"inpNo","visitId","name","sex","bedNumber","deptName","dischargeDateTime","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtNurseDate","emrDoctorCmt","emrNureCmt","deathFlag","printNum","isFault","archivestate"};
         //文件名
         String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据beHospList

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

@@ -123,18 +123,18 @@ public class lastVerifyController {
             String inpatientNo = archiveMaster.getInpNo();
             //获取留观标识，“LG”
             String lgFlag = inpatientNo.substring(0,2);
+            //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示
+            Emr_Fault_Detail entityFault=new Emr_Fault_Detail();
+            entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
+            List<Emr_Fault_Detail> list=emrFaultDetailService.selectByArchiveId(entityFault);
             //退回给emr
             if(!"LG".equals(lgFlag)) {
-                String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request);
+                String result = archiveMasterService.returnEmr(list,emrFaultDetail, archiveMaster, request);
                 if (StringUtils.isNotBlank(result)) {
                     return result;
                 }
             }
             archiveMaster.setArchivestate(emrFaultDetail.getState());
-            //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示
-            Emr_Fault_Detail entityFault=new Emr_Fault_Detail();
-            entityFault.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
-            List<Emr_Fault_Detail> list=emrFaultDetailService.selectByArchiveId(entityFault);
             int doctorFlagNum=0;
             int nurseFlagNum=0;
             if(list!=null && list.size()>0){

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

@@ -178,6 +178,16 @@ public class Archive_Master_Vo {
     //退回急诊室总数
     private Integer backNum;
 
+    private String isFault;
+
+    public String getIsFault() {
+        return isFault;
+    }
+
+    public void setIsFault(String isFault) {
+        this.isFault = isFault;
+    }
+
     public String getFaultDoctorNum() {
         return faultDoctorNum;
     }

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

@@ -59,6 +59,17 @@ public class V_Count {
     //及时率合计
     private String inTimeRate;
 
+    //是否是查留观
+    private Integer isLg;
+
+    public Integer getIsLg() {
+        return isLg;
+    }
+
+    public void setIsLg(Integer isLg) {
+        this.isLg = isLg;
+    }
+
     public Integer getIsOutNum() {
         return isOutNum;
     }

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

@@ -263,7 +263,7 @@ public interface Archive_MasterService {
      */
     List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo record);
 
-    String returnEmr(Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request);
+    String returnEmr( List<Emr_Fault_Detail> list,Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request);
 
     /**
      * 复印记录明细

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

@@ -594,13 +594,26 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
      * @param request
      */
     @Override
-    public String returnEmr(Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request) {
+    public String returnEmr(List<Emr_Fault_Detail> list,Emr_Fault_Detail emrFaultDetail, Archive_Master archiveMaster, HttpServletRequest request) {
         String returnMsg = null;
         //获取退回标识，0打回首页；1打回医生；2打回护士
         String returnFlag = emrFaultDetail.getDealFlag();
         if(StringUtils.isNotBlank(returnFlag)) {
             //获取打回原因
-            String returnContent = emrFaultDetail.getDealPerson();
+            StringBuilder returnContent = new StringBuilder();
+            if(!CollectionUtils.isEmpty(list)){
+                for(Emr_Fault_Detail obj : list){
+                    if(StringUtils.isNotBlank(returnContent)){
+                        returnContent.append(",");
+                    }
+                    returnContent.append(obj.getBackContent());
+                    String content = obj.getContent();
+                    if(StringUtils.isBlank(content)){
+                        content = "无";
+                    }
+                    returnContent.append(":").append(content);
+                }
+            }
             //组织打回参数值
             /*{
                 "INP_NO": "1356601",
@@ -623,7 +636,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             map.put("userid",user.getUserId().toString());
             map.put("username",user.getUserName());
             map.put("code",archiveMaster.getDeptName());
-            map.put("REASON",returnContent);
+            map.put("REASON",returnContent.toString());
             //定义请求信息记录表
             DocusRequestInfo docusRequestInfo = new DocusRequestInfo();
             docusRequestInfo.setCode("return");

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -402,11 +402,11 @@
     </select>
 
     <select id="selectByLast" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
-        select DISTINCT m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,
+        select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,ISNULL(f.name,m.dept_name) dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,
         ISNULL(d.name,m.dept_admission_to) dept_admission_to,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
         m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,
         m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign
-        ,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
+        ,case when emr_fault_detail.archive_detail_id is not null then '是' else '否' end isFault,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
         from archive_master m
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
         typeCode='dept_code' )) d
@@ -416,6 +416,8 @@
         on m.dept_name=f.code
         LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor
         on m.id=sDoctor.archive_detail_id
+        left join (select distinct archive_detail_id from emr_fault_detail where back_flag in ('6','5')) emr_fault_detail
+        on emr_fault_detail.archive_detail_id = m.ID
         LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('2','6') GROUP BY archive_detail_id) sNurse
         on m.id=sNurse.archive_detail_id
         left join Archive_Master_Following amf
@@ -429,6 +431,14 @@
         on m.id=printTable.MasterID
         where 1=1 and ArchiveState in('初审') and  m.Is_Valid!=1
         and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%'
+        <if test="isFault != null  and isFault != ''">
+            <if test="isFault == 1">
+                AND emr_fault_detail.archive_detail_id is not null
+            </if>
+            <if test="isFault == 0">
+                AND emr_fault_detail.archive_detail_id is  null
+            </if>
+        </if>
         <if test="printNum != null and printNum != ''">
             <choose>
                 <when test="printNum == 1">

src/main/resources/mapper/Emr_Fault_DetailMapper.xml

@@ -293,7 +293,12 @@
   </select>
 
   <select id="selectByArchiveId" parameterType="com.emr.entity.Emr_Fault_Detail" resultMap="BaseResultMap">
-    select DISTINCT m.back_flag from emr_fault_detail m
+    select DISTINCT m.back_flag,m.content,emr_fault_type.type_name backContent
+      FROM
+      emr_fault_detail m
+      inner join
+      emr_fault_type on
+      m.assort_id = emr_fault_type.id
     where 1=1 and m.deal_flag='0' and m.back_flag in (1,2,5,6)
     <if test="archiveDetailId != null">
       and m.archive_detail_id = #{archiveDetailId,jdbcType=NVARCHAR}

src/main/resources/mapper/V_CountMapper.xml

@@ -182,6 +182,14 @@
             and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR}
           </when>
         </choose>
+        <choose>
+            <when test="isLg == 1">
+                and inp_no like 'LG%'
+            </when>
+            <otherwise>
+                and inp_no not like 'LG%'
+            </otherwise>
+        </choose>
       </where>
       GROUP BY dept_name
     ) as a
@@ -206,6 +214,14 @@
         from archive_master
       <where>
           1=1 and ArchiveState NOT IN ('已封存', '作废','在院','') and Is_Valid!=1 and ArchiveState is not null
+          <choose>
+              <when test="isLg == 1">
+                  and inp_no like 'LG%'
+              </when>
+              <otherwise>
+                  and inp_no not like 'LG%'
+              </otherwise>
+          </choose>
           <choose>
               <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
                   and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and #{endDate,jdbcType=NCHAR}

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

@@ -519,6 +519,14 @@
                             <option value="0">未打印</option>
                         </select>
                     </div>
+                    <div class="form-group ">
+                        <label>是否缺陷:</label>
+                        <select class="input-sm form-control" id="isFault">
+                            <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">--%>
@@ -3287,7 +3295,8 @@
                         //startSignDate: $("#startSignDate").val(),
                         //endSignDate: $("#endSignDate").val(),
                         isSign: $("#isSign").val(),
-                        printNum:$("#printNum").val()
+                        printNum:$("#printNum").val(),
+                        isFault:$("#isFault").val()
                     };
                     return temp;
                 },
@@ -3788,6 +3797,22 @@
                             }
                             return html;
                         }
+                    },{
+                        title: '是否缺陷',
+                        field: 'isFault',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var color = '';
+                            var iValue = '';
+                            if (value == '是') {
+                                color = 'red';
+                                iValue = '<i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>';
+                            } else {
+                                color = 'green';
+                                iValue = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>';
+                            }
+                            return '<span style="color:'+color+'">'+iValue+value+'</span>';
+                        }
                     },
                     {
                         title: '初审人',
@@ -4854,11 +4879,10 @@
         var isScanning=$("#isScanning").val();
         var isSign=$("#isSign").val();
         var printNum=$("#printNum").val();
-
+        var isFault = $("#isFault").val();
         window.location.href = "${path}/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName  + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
-            + "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum;
-
+            + "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum + "&isFault="+isFault;
     });
 
     var zNodes = [];

src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp

@@ -82,6 +82,7 @@
 </head>
 
 <body>
+<input hidden id="isLg" value="${isLg}">
 <div class="tjCss" id="dataDiv">
     <!--搜索-->
     <form class="formCss">
@@ -224,6 +225,7 @@
         entity.deptCode = $("#deptName").val();
         entity.startDate = $("#startDate").val();
         entity.endDate = $("#endDate").val();
+        entity.isLg = $("#isLg").val();
         $.ajax({
             url: "${path}/vCount/vCountNumList",
             type: "POST",
@@ -895,8 +897,8 @@
                         startDate: $("#startDate").val(),
                         endDate: $("#endDate").val(),
                         timeOutNum: $("#timeOutNum").val(),
-                        overdueDays: $("#overdueDays").val()
-
+                        overdueDays: $("#overdueDays").val(),
+                        isLg:$("#isLg").val()
                     };
                     return temp;
                 },
@@ -1142,9 +1144,9 @@
         var startDateTo = $("#startDate").val();
         var endDateTo = $("#endDate").val();
         var archivestate="归档中,初审,复审退回,提交,主任退回";
-
+        var isLg = $("#isLg").val();
         window.location.href = "${path}/vCount/exportExcel2?deptName=" + deptName + "&startDateTo=" + startDateTo
-            + "&endDateTo=" + endDateTo+ "&archivestate=" + archivestate;
+            + "&endDateTo=" + endDateTo+ "&archivestate=" + archivestate + "&isLg=" + isLg;
     });