导出名字错误

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

@@ -223,7 +223,7 @@ public class StatisticsController {
         try {
             List<Archive_Master_Vo> list = statisticsService.getDetailList(disStartDate, disEndDate, archiveMasterVo,flag,sql);
             //文件名
-            String fileName = "病案室审核记录明细报表(" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + ").xls";
+            String fileName = "终审记录明细报表(" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + ").xls";
             //ExportExcelUtil
             ExportExcelUtil1 exportExcelUtil = new ExportExcelUtil1();
             //导出excel的操作

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

@@ -14,4 +14,6 @@ public interface ArchiveCallbackInfoMapper {
     List<ArchiveCallbackInfoVo> selectAll(ArchiveCallbackInfoVo callbackInfoVo);
 
     int deleteRecordByRecall(@Param("patientId")String patientId);
+
+    int deleteRecordByInp(@Param("masterId")String masterId);
 }

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

@@ -2,6 +2,7 @@ package com.emr.dao;
 
 import com.emr.entity.Archive_Master;
 import com.emr.entity.Archive_Master_Vo;
+import com.emr.vo.CommomVo;
 import com.emr.vo.DoctorStatistics;
 import com.emr.vo.RecordCommonVo;
 import com.emr.vo.RecordStatisticsHome;
@@ -96,4 +97,8 @@ public interface Archive_MasterMapper {
                                              @Param("startDateTo")String startDateTo,
                                              @Param("endDateTo")String endDateTo);
     List<String> selectBabyIdWithScan();
+
+    int insertCommonlyUsed(CommomVo commomVo);
+
+    List<Archive_Master> selectCommonlyUsed(Archive_Master record);
 }

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

@@ -8,9 +8,26 @@ public class Archive_Master {
     private String patientId;
 
     private String inpNo;
-
+    private String SubAssort;
     private String visitId;
 
+    public String getSubAssort() {
+        return SubAssort;
+    }
+
+    public void setSubAssort(String subAssort) {
+        SubAssort = subAssort;
+    }
+
+    public String getDeptName1() {
+        return deptName1;
+    }
+
+    public void setDeptName1(String deptName1) {
+        this.deptName1 = deptName1;
+    }
+
+    private String deptName1;
     private String name;
 
     private String sex;

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

@@ -80,6 +80,7 @@ public class ArchiveCallbackInfoService {
         List<ArchiveFlowRole> archiveFlowRoles = flowRoleMapper.selectAll();
         List<ArchiveFlowRole> currentRoleAndNextRole = archiveFlowInfoService.getCurrentRoleAndNextRole(currentCode,targetCode,archiveFlowRoles);
         archiveFlowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date());
+        callbackInfoMapper.deleteRecordByInp(masterId);
     }
 
     private String getAddressIp() throws Exception{

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

@@ -13,6 +13,7 @@ import com.emr.service.Emr_Fault_DetailService;
 import com.emr.util.ExceptionPrintUtil;
 import com.emr.util.Msg;
 import com.emr.util.OracleConnect;
+import com.emr.vo.CommomVo;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,8 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -61,6 +64,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     private ArchiveForceSumbitInfoService archiveForceSumbitInfoService;
     @Autowired
     private ArchiveOtherExtMapper archiveOtherExtMapper;
+    @Autowired
+    private  Archive_MasterMapper archive_masterMapper;
     /**
      * 在院列表
      * */
@@ -1185,17 +1190,58 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String ids = master.getId();
         String[] idList = ids.split(",");
-        String patientId = master.getPatientId();
-        String[] patientIdList = patientId.split(",");
         List<ArchiveFlowRole> archiveFlowRoles = flowRoleMapper.selectAll();
-        for(int i = 0;i < idList.length;i++) {
-            String id = idList[i];
+        List<Archive_Master> archive_masterVos = archive_masterMapper.selectCommonlyUsed(master);
+        if(CollectionUtils.isEmpty(archive_masterVos)){
+            return;
+        }
+        Archive_Master archive_master_vos = archive_masterVos.get(0);
+        CommomVo commomVo=new CommomVo();
+        commomVo.setPatientId(archive_master_vos.getId());
+        commomVo.setAdmissTimes(archive_master_vos.getVisitId());
+        commomVo.setAdmissId(archive_master_vos.getInpNo());
+        commomVo.setInpatientNo(archive_master_vos.getInpNo());
+        commomVo.setName(archive_master_vos.getName());
+        commomVo.setCheckedDatetime(format1.format(new Date()));
+        commomVo.setSex(archive_master_vos.getSex());
+        commomVo.setAdmissId(archive_master_vos.getId());
+        String subAssort = archive_master_vos.getSubAssort();
+        int index = subAssort.indexOf("岁");
+        String before = subAssort.substring(0,index);
+        commomVo.setAge(before);
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date date1=null;
+        Date date2=null;
+        String dischargeDateTime = archive_master_vos.getDischargeDateTime();
+        String admissionDateTime = archive_master_vos.getAdmissionDateTime();
+        try {
+            date1=format.parse(dischargeDateTime);
+            date2=format.parse(admissionDateTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar ca1 = Calendar.getInstance();
+        Calendar ca2 = Calendar.getInstance();
+        ca1.setTime(date1);
+        ca2.setTime(date2);
+        long distanceMin =( ca1.getTimeInMillis()- ca2.getTimeInMillis())/(1000*60*60*24);
+        int i2= (int)distanceMin;
+        commomVo.setAdmissDays(i2);
+        int i = Integer.parseInt(before);
+        int i1 = i * 12;
+        String s = String.valueOf(i1);
+        commomVo.setAgeMonth(s);
+        commomVo.setAdmissDate(archive_master_vos.getAdmissionDateTime());
+        commomVo.setDisDate(archive_master_vos.getDischargeDateTime());
+        commomVo.setDisDept(archive_master_vos.getDeptName1());
+        commomVo.setAttending(archive_master_vos.getDoctorInCharge());
+        archive_masterMapper.insertCommonlyUsed(commomVo);
+        for(String id : idList) {
             if(StringUtils.isNotBlank(id)) {
                 //修改病案归档状态
                 Archive_Master archiveMaster = new Archive_Master();
                 master.setId(id);
                 //拷贝对象
-                master.setPatientId(patientIdList[i]);
                 BeanUtils.copyProperties(master, archiveMaster);
                 //定义提交时间
                 //设置审核时间
@@ -1221,7 +1267,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 List<ArchiveFlowRole> currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(currentStatus, EnumVerify.DocState.MedicalRoomCheck.getCode(),archiveFlowRoles);
                 //添加流转节点
                 ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(master.getId(), master.getRemark(), currentRoleAndNextRole.get(0), currentRoleAndNextRole.get(1), sumbitDate);
-                insertOracle(0,flowInfo);
+                //insertOracle(0,flowInfo);
                 //添加纸质位置
                 paperPostionService.savePaperPostion(master);
             }

src/main/resources/mapper/ArchiveCallbackInfoMapper.xml

@@ -118,4 +118,7 @@
             delete from t_admiss_thing where patient_id = #{patientId};
         end
     </delete>
+    <delete id="deleteRecordByInp" parameterType="java.lang.String">
+        DELETE FROM commomtable WHERE admiss_id = #{masterId}
+    </delete>
 </mapper>

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1221,6 +1221,97 @@
             </if>
         </trim>
     </insert>
+    <insert id="insertCommonlyUsed" parameterType="com.emr.vo.CommomVo">
+        insert into commomtable
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="patientId != null">
+                patient_id,
+            </if>
+            <if test="admissTimes != null">
+                admiss_times,
+            </if>
+            <if test="inpatientNo != null">
+                inpatient_no,
+            </if>
+            <if test="name != null">
+                name,
+            </if>
+            <if test="sex != null">
+                sex,
+            </if>
+            <if test="age != null">
+                age,
+            </if>
+            <if test="admissDate != null">
+                admiss_date,
+            </if>
+            <if test="disDate != null">
+                dis_date,
+            </if>
+            <if test="disDept != null">
+                dis_dept,
+            </if>
+            <if test="checkedDatetime != null">
+                checked_datetime,
+            </if>
+            <if test="admissId != null">
+                admiss_id,
+            </if>
+            <if test="ageMonth != null">
+                age_month,
+            </if>
+            <if test="attending != null">
+                attending,
+            </if>
+            <if test="admissDays != null">
+                admiss_days,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="patientId != null">
+                #{patientId,jdbcType=NVARCHAR},
+            </if>
+            <if test="admissTimes != null">
+                #{admissTimes,jdbcType=INTEGER},
+            </if>
+            <if test="inpatientNo != null">
+                #{inpatientNo,jdbcType=NVARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=NVARCHAR},
+            </if>
+            <if test="sex != null">
+                #{sex,jdbcType=NVARCHAR},
+            </if>
+            <if test="age != null">
+                #{age,jdbcType=NVARCHAR},
+            </if>
+            <if test="admissDate != null">
+                #{admissDate,jdbcType=DATE},
+            </if>
+            <if test="disDate != null">
+                #{disDate,jdbcType=DATE},
+            </if>
+            <if test="disDept != null">
+                #{disDept,jdbcType=NVARCHAR},
+            </if>
+            <if test="checkedDatetime != null">
+                #{checkedDatetime,jdbcType=NVARCHAR},
+            </if>
+            <if test="admissId != null">
+                #{admissId,jdbcType=NVARCHAR},
+            </if>
+            <if test="ageMonth != null">
+                #{ageMonth,jdbcType=NVARCHAR},
+            </if>
+            <if test="attending != null">
+                #{attending,jdbcType=NVARCHAR},
+            </if>
+            <if test="admissDays != null">
+                #{admissDays,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
     <update id="updateByClo" parameterType="com.emr.entity.Archive_Master">
         update archive_master
         <set>
@@ -1595,6 +1686,13 @@
     <select id="selectBabyIdWithScan" resultType="java.lang.String">
         <include refid="selectBabyIdWithScanSql"></include>
     </select>
+    <select id="selectCommonlyUsed" resultMap="BaseResultMap"
+            parameterType="java.lang.String">
+        select *,emr_dictionary.Name as deptName1 from  archive_master
+   LEFT JOIN emr_dictionary ON archive_master.dept_name = emr_dictionary. CODE
+        AND emr_dictionary.parent_id = 'dept_code'
+         where patient_id=#{patientId}
+    </select>
     <sql id="selectBabyIdWithScanSql">
         SELECT
             b.ID

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

@@ -328,6 +328,7 @@
                         </div>
                         <div class="col-sm-8 divCss5" style="width: 73%">
                             <div class="row btnGroupCss">
+                                <button type="button" class="btn btn-danger btn-sm" id="checkSuccessBtn">查看完整性</button>
                                 <button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件</button>
                                 <button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
                                 <button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>

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

@@ -641,6 +641,31 @@ $("#approvesBtn").on('click', function () {
     }
 });
 
+/**
+ * 校验完整性
+ * */
+function backSetValue1(id) {
+    $("#checkSuccessBtn").click(function () {
+        var masterId = id
+        var result = checkSuccessMethod(masterId);
+        debugger
+        if (result != '失败') {
+            $("#wzContent").text(result);
+            //增加完整性刷新后高亮状态
+            $("#wzContent").addClass("wzContent");
+            toastr.success("完整性状态已刷新");
+            //刷新表格
+            $('#table').bootstrapTable('updateByUniqueId', {
+                id: masterId,
+                row: {
+                    lockinfo: result
+                }
+            });
+        } else {
+            toastr.warning("校验失败,校验程序未启动或出错!");
+        }
+    })
+}
 //批量终审确认提交
 $("#sureBtn").on('click',function(){
     approveMethod();

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

@@ -231,7 +231,7 @@ function initTable() {
                                     temp = '<button class="btn btn-warning btn-sm" onclick="recallFun(\'' + row.id + '\',\'' + row.archiveDetailId + '\',' + row.patientId + ')">召回 </button>';
                                 }
                             }
-                            temp += '<button type="button" class="btn btn-sm btn-success showFlowInfo" title="查看流程">查看流程</button>';
+                            // temp += '<button type="button" class="btn btn-sm btn-success showFlowInfo" title="查看流程">查看流程</button>';
                         }
                         temp += '<button type="button" class="btn btn-sm btn-primary paperPosition" title="纸质位置">纸质位置</button>';
                         return temp;