任务详情搜索条件无法使用

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

@@ -209,10 +209,11 @@ public class beHospitaledController {
     @ResponseBody
     @RequestMapping(value = "/updateStateByArchivId")
     public Msg updateStateByArchivId(HttpServletRequest request,Archive_Master_Vo master) throws Exception{
-        boolean flag = FormTokenFlagUtil.isFlag(request);
-        if (!flag) {
-            return Msg.fail("请不要重复提交!");
-        }
+        //2023/6/5注释提交重复
+//        boolean flag = FormTokenFlagUtil.isFlag(request);
+//        if (!flag) {
+//            return Msg.fail("请不要重复提交!");
+//        }
         return archiveMasterService.updateStateByArchivId(master);
     }
 

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;
@@ -48,6 +49,8 @@ public interface Archive_MasterMapper {
      * */
     List<Archive_Master_Vo> selectFiled(Archive_Master_Vo master);
 
+    int insertCommonlyUsed(CommomVo commomVo);
+
     /**
      * 根据masterIds集合批量更新LockInfo字段
      * @param masterIds

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

@@ -133,6 +133,9 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
         if (source.equals("PACS系统采集服务")){
             record.setSource("'3','PACS系统采集服务'");
         }
+        if (!source.equals("移动护理系统采集服务")&&!source.equals("PACS系统采集服务")&&StringUtils.isNotBlank(source)){
+            record.setSource("'"+ source + "'");
+        }
         List<Archive_Detail_Vo> list = archiveDetailMapper.detailByClo(record);
         OffsetLimitPage offsetLimitPage = new OffsetLimitPage((Page) list);
         if(!CollectionUtils.isEmpty(list)) {
@@ -153,6 +156,16 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
                 if (detailVo1.getAssortId().equals(nurseAssortId) && detailVo1.getTitle().contains(nurseTemp)) {
                     nurseDetailVoTemp = detailVo1;
                 }
+                if (StringUtils.isNotBlank(detailVo1.getSource())){
+                    if (detailVo1.getSource().equals("1")){
+                        detailVo1.setSource("移动护理系统采集服务");
+                    }
+                }
+                if (StringUtils.isNotBlank(detailVo1.getSource())){
+                    if (detailVo1.getSource().equals("3")){
+                        detailVo1.setSource("PACS系统采集服务");
+                    }
+                }
                 //页码为0的读取pdf文件重置页码
                 setPdfPages(detailVo1);
             }

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

@@ -64,6 +64,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     private ArchiveForceSumbitInfoService archiveForceSumbitInfoService;
     @Autowired
     private ArchiveOtherExtMapper archiveOtherExtMapper;
+    @Autowired
+    private  Archive_MasterMapper archive_masterMapper;
 
     /**
      * 在院列表
@@ -1110,7 +1112,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 return Msg.fail("初始状态出错了!");
             }
         }
-        return Msg.fail("该病理正处于召回状态不允许提交!");
+        return Msg.fail("该病历正处于召回状态不允许提交!");
     }
 
     /**
@@ -1298,7 +1300,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             for (Archive_Master list : archive_masterVos) {
                 commomVo.setPatientId(list.getId());
                 commomVo.setAdmissTimes(list.getVisitId());
-                commomVo.setInpatientNo(list.getIdNo());
+                commomVo.setInpatientNo(list.getInpNo());
                 commomVo.setName(list.getName());
                 commomVo.setAdmissId(list.getPatientId());
                 commomVo.setSex(list.getSex());
@@ -1306,6 +1308,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 commomVo.setDisDate(list.getDischargeDateTime());
                 commomVo.setDisDept(list.getDeptNameCode());
                 commomVo.setAttending(list.getDoctorInCharge());
+                archive_masterMapper.insertCommonlyUsed(commomVo);
             }
             if (StringUtils.isNotBlank(id)) {
                 //修改病案归档状态

src/main/resources/config/config.properties

@@ -74,6 +74,6 @@ oraclePassWord = Jswzh
 calculationTime= 2022/08/01
 
 
-qualitySwitch=1
+qualitySwitch=2
 
 

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -886,6 +886,97 @@
         </if>
         ORDER BY m.discharge_date_time desc
     </select>
+    <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},
+            </if>
+            <if test="disDate != null">
+                #{disDate},
+            </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>
     <!--查询已归档记录-->
     <select id="selectFiled" resultMap="BaseResultMap2">
         SELECT

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

@@ -237,8 +237,8 @@
                         <label>HIS召回状态:</label>
                         <select class="form-control input-sm" id="callBackStatus">
                             <option value="">全部</option>
-                            <option value="1">是</option>
-                            <option value="0">否</option>
+                            <option value="1">召回完成</option>
+                            <option value="0">未召回</option>
                         </select>
                     </div>
                     <div class="form-group divCss">

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

@@ -237,8 +237,8 @@
                         <label>HIS召回状态:</label>
                         <select class="form-control input-sm" id="callBackStatus">
                             <option value="">全部</option>
-                            <option value="1">是</option>
-                            <option value="0">否</option>
+                            <option value="1">召回完成</option>
+                            <option value="0">未召回</option>
                         </select>
                     </div>
                     <div class="form-group divCss">

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

@@ -200,8 +200,8 @@
                         <label>HIS召回状态:</label>
                         <select class="form-control input-sm" id="callBackStatus">
                             <option value="">全部</option>
-                            <option value="1">是</option>
-                            <option value="0">否</option>
+                            <option value="1">召回完成</option>
+                            <option value="0">未召回</option>
                         </select>
                     </div>
                     <div class="form-group divCss">

src/main/webapp/static/js/beHospList/beHospList.js

@@ -133,7 +133,7 @@ function initTable() {
                 },
                 {
                     title: '状态',
-                    field: 'status',
+                    field: 'currentStatus',
                     align: 'center',
                     valign: 'middle',
                     formatter: paramsMatter
@@ -159,9 +159,9 @@ function initTable() {
                     formatter: function (value, row) {
                         var callBackStatus = row.callBackStatus;
                         if (callBackStatus == '召回完成' ||callBackStatus == '召回中') {
-                            return '<span style="color:green">已召回</span>';
+                            return '<span style="color:green">召回完成</span>';
                         } else {
-                            return '<span style="color:red">否</span>';
+                            return '<span style="color:red">未召回</span>';
                         }
                     }
                 },

src/main/webapp/static/js/beHospList/beHospList1.js

@@ -155,12 +155,12 @@ function initTable() {
                     field: 'hisStatic',
                     align: 'center',
                     valign: 'middle',
-                    formatter:function(value, row){
-                        var hisStatic = row.hisStatic;
-                        if(hisStatic == '已召回'){
-                            return '<span style="color:green">'+hisStatic+'</span>';
-                        }else{
-                            return '<span style="color:red">否</span>';
+                    formatter: function (value, row) {
+                        var callBackStatus = row.callBackStatus;
+                        if (callBackStatus == '召回完成' ||callBackStatus == '召回中') {
+                            return '<span style="color:green">召回完成</span>';
+                        } else {
+                            return '<span style="color:red">未召回</span>';
                         }
                     }
                 },

src/main/webapp/static/js/hospitalCommom/hospitalCommom.js

@@ -705,14 +705,14 @@ function initTable2() {
                 align: 'center',
                 valign: 'middle',
                 width: 50, // 定义列的宽度，单位为像素px
-                formatter:function(value, row){
-                    if(value=="1"){
-                        return '<span >移动护理系统采集服务</span>';
-                    }
-                    if(value=="3"){
-                        return '<span >PACS系统采集服务</span>';
-                    }
-                }
+                // formatter:function(value, row){
+                //     if(value=="1"){
+                //         return '<span >移动护理系统采集服务</span>';
+                //     }
+                //     if(value=="3"){
+                //         return '<span >PACS系统采集服务</span>';
+                //     }
+                // }
             },
             {
                 title: '状态',

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

@@ -190,13 +190,14 @@ function initTable() {
                 },
                 {
                     title: 'HIS召回状态',
-                    field: 'callBackStatus',
+                    field: 'hisStatic',
                     align: 'center',
                     valign: 'middle',
-                    formatter:function(value, row){
-                        if(value != '否'){
-                            return '<span style="color:green">'+value+'</span>';
-                        }else{
+                    formatter: function (value, row) {
+                        var callBackStatus = row.callBackStatus;
+                        if (callBackStatus == '召回完成' ||callBackStatus == '召回中') {
+                            return '<span style="color:green">召回完成</span>';
+                        } else {
                             return '<span style="color:red">未召回</span>';
                         }
                     }