更新版本20201128

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

@@ -99,7 +99,7 @@ public class ArchiveOtherExtController {
      */
     @RequestMapping("selectAllByIdsAndSubmitTime")
     @ResponseBody
-    public Msg selectSuccessByExtIds(String ids) throws Exception{
+    public Msg selectSuccessByExtIds(String ids,String jzh) throws Exception{
         if(StringUtils.isNotBlank(ids)){
             String[] split = ids.split(",");
             StringBuilder temp = new StringBuilder();
@@ -111,7 +111,7 @@ public class ArchiveOtherExtController {
                     temp.append("'").append(str).append("'");
                 }
             }
-            List<ArchiveOther> list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString());
+            List<ArchiveOther> list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString(),jzh);
             return Msg.success().add("list",list);
         }else{
             return Msg.fail("参数ids不能为空");

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

@@ -31,7 +31,7 @@ public interface ArchiveOtherExtMapper {
      * @param ids
      * @return
      */
-    List<ArchiveOther> selectAllByIdsAndSubmitTime(@Param("ids")String ids);
+    List<ArchiveOther> selectAllByIdsAndSubmitTime(@Param("ids")String ids,@Param("patientId")String patientId);
 
     /**
      * 查询未同步更新完成的文件名称集合
@@ -45,4 +45,11 @@ public interface ArchiveOtherExtMapper {
      * @return
      */
     List<ArchiveOtherExt> selectNotCompleteMidList();
+
+    /**
+     * 根据记账号查询该病例护理记录的最新采集完成时间
+     * @param patientId 记账号
+     * @return
+     */
+    String selectMaxETimeByNursingAndJzh(@Param("patientId")String patientId);
 }

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

@@ -49,7 +49,12 @@ public class ArchiveOtherExtService {
             //读取系统标识json文件
             String fileNamePath = "static/json/dictionary.json";
             List<KeyValue> statusAndSysFlagValues = readJsonData(request, fileNamePath);
+            //查询护理的最新采集完成时间
+            String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh());
             for(ArchiveOtherExtVo vo : list){
+                if(StringUtils.isNotBlank(maxETime)){
+                    vo.setTempTime(maxETime);
+                }
                 //presulit为Done转换为完成
                 String presult = vo.getPresult();
                 if(StringUtils.isNoneBlank(presult) && "done".equalsIgnoreCase(presult)){
@@ -301,8 +306,8 @@ public class ArchiveOtherExtService {
      * @param ids
      * @return
      */
-    public List<ArchiveOther> selectAllByIdsAndSubmitTime(String ids) {
-        return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids);
+    public List<ArchiveOther> selectAllByIdsAndSubmitTime(String ids,String jzh) {
+        return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids,jzh);
     }
 
     /**

src/main/java/com/emr/vo/ArchiveOtherExtVo.java

@@ -34,4 +34,6 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt {
     private String assortName;
 
     private String assortId;
+
+    private String tempTime;
 }

src/main/resources/mapper/ArchiveOtherExtMapper.xml

@@ -529,11 +529,32 @@
       SELECT
           archive_other_ext.ID
       FROM
-          archive_other_ext
+          (SELECT
+              CASE
+                  WHEN
+                      sysFlag = 1 THEN
+                          (
+                          SELECT
+                              MAX( eTime ) eTime
+                          FROM
+                              archive_other_ext
+                          WHERE
+                              sysFlag = 1
+                              AND jzh = #{patientId}
+                          GROUP BY
+                              sysFlag,
+                              jzh
+                          ) ELSE eTime
+                      END eTime,
+                  ID
+              FROM
+                  archive_other_ext
+              WHERE
+                  ID IN (${ids}))
+	 archive_other_ext
           INNER JOIN archive_other_ext_submitTime ON archive_other_ext.ID = archive_other_ext_submitTime.other_ext_id
       WHERE
           eTime > create_time
-          AND archive_other_ext.ID IN ( ${ids} )
   </select>
   <!--查询未同步更新完成的文件名称集合-->
   <select id="selectC1WithNotCollectFinishByPatientId" resultMap="BaseResultMap">
@@ -544,11 +565,32 @@
                   '长临医嘱' ELSE C1
               END C1
       FROM
+          (SELECT
+              CASE
+                  WHEN
+                      sysFlag = 1 THEN
+                          (
+                          SELECT
+                              MAX( eTime ) eTime
+                          FROM
+                              archive_other_ext
+                          WHERE
+                              sysFlag = 1
+                              AND archive_other_ext.jzh = #{patientId}
+                          GROUP BY
+                              sysFlag,
+                              jzh
+                          ) ELSE eTime
+                      END eTime,
+                  ID,sysFlag,C1
+              FROM
+                  archive_other_ext
+              WHERE
+                  archive_other_ext.jzh = #{patientId})
           archive_other_ext
           INNER JOIN archive_other_ext_submitTime ON archive_other_ext.ID = archive_other_ext_submitTime.other_ext_id
       WHERE
-          archive_other_ext.jzh = #{patientId}
-          AND archive_other_ext_submitTime.create_time > archive_other_ext.eTime
+          archive_other_ext_submitTime.create_time > archive_other_ext.eTime
   </select>
   <!--查询校验不完整的集合-->
   <select id="selectNotCompleteMidList" resultMap="BaseResultMap">
@@ -563,4 +605,8 @@
     GROUP BY
         MID
   </select>
+  <!--根据记账号查询该病例护理记录的最新采集完成时间-->
+  <select id="selectMaxETimeByNursingAndJzh" resultType="java.lang.String">
+    select top 1 eTime from archive_other_ext where sysFlag = 1 and jzh = #{patientId} order by eTime desc
+  </select>
 </mapper>

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

@@ -832,6 +832,6 @@
 </div>
 </body>
 <script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-25_3"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-16"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-27"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>

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

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

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

@@ -1051,6 +1051,7 @@ $("#saveBtn").click(function () {
     });
 });
 $("#workDetail").click(function(){
+    pageNumber = 1;
     //撤销监听
     cancleListentingSuccess();
     $("#workDetailModal").modal({
@@ -1236,7 +1237,9 @@ function initTable5(data,sidePagination) {
                 valign: 'middle',
                 sortable: true,
                 formatter: function (value, row, index) {
-                    return selectTimeColor(value,row.etimeStr,1);
+                    //若是护理记录取护理最新采集完成时间，否则取正常采集完成时间
+                    var etimeStr = row.sysflag == 1 ? row.tempTime : row.etimeStr;
+                    return selectTimeColor(value,etimeStr,1);
                 }
             },
             {
@@ -1417,7 +1420,7 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
                         $.ajax({
                             type: 'get',
                             url: path + '/archiveExt/selectAllByIdsAndSubmitTime',
-                            data: {ids: otherExtIds},
+                            data: {ids: otherExtIds,jzh:jzh},
                             dataType: 'json',
                             async:false,
                             success: function (result) {
@@ -1439,12 +1442,12 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
                             }
                         })
                     }
+                    setTimeout(function(){
+                        toastr.error("后台按需采集超时,请联系系统运维人员");
+                        //隐藏加载控件
+                        $("#loading").hide();
+                    },timeOut);
                 },intervalTime);
-                setTimeout(function(){
-                    toastr.error("后台按需采集超时,请联系系统运维人员");
-                    //隐藏加载控件
-                    $("#loading").hide();
-                },timeOut);
             }else{
                 toastr.error(data.msg);
             }