解决oracle时间格式，完整性直接查lockinfo字段

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

@@ -195,7 +195,9 @@ public class beHospitaledController {
     @RequestMapping(value = "/checkSuccess")
     private String checkSuccessMethod(String archiveDetailId){
         String result = "";
-        String endpoint = HomepageDictionary;
+        Archive_Master archiveMaster = archiveMasterService.selectByPrimaryKey(archiveDetailId);
+        result = archiveMaster.getLockinfo();
+        /*String endpoint = HomepageDictionary;
         String method = HomepageMethod;
         JAXDynamicClientFactory factory = JAXDynamicClientFactory.newInstance();
         Client client = null;
@@ -219,7 +221,7 @@ public class beHospitaledController {
             if(null != client){
                 client.destroy();
             }
-        }
+        }*/
         return result;
     }
 

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

@@ -1328,26 +1328,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //加入日志
     }
 
-    /**
-     * 格式化时间判断
-     * @param time
-     * @param jzh
-     * @param dataBaseName
-     * @param sysFlagStr
-     * @return
-     */
-    private Date judgeTime(String time,String jzh,String dataBaseName,String sysFlagStr){
-        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            Date parse = fmt.parse(time);
-            return parse;
-        } catch (ParseException e) {
-            e.printStackTrace();
-            log.info("实时查询各个采集任务是否采集完成格式化时间出错了:"+"数据库："+dataBaseName+"." + sysFlagStr + ";记账号："+jzh);
-        }
-        return null;
-    }
-
     @Override
     public Msg judgeCollectCompleted(String jzh) {
         //定义失败提示语
@@ -1364,10 +1344,17 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     //获取文件名
                     String showName = (String)map1.get("SHOW_NAME");
                     //获取最后时间
-                    String kdsj = (String)map1.get("KDSJ");
-                    Date kdsjDate = judgeTime(kdsj, jzh, "MZ", "V_JSWZH_HL_DATA");
+                    Date kdsjDate = null;
+                    if(null != map1.get("KDSJ")){
+                        try {
+                            kdsjDate = (Date)map1.get("KDSJ");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            return Msg.fail("护理记录任务的时间格式不符合规范");
+                        }
+                    }
                     if(null == kdsjDate){
-                        return Msg.fail("护理记录任务的时间格式不符合规范");
+                        return Msg.fail("护理记录任务的时间为空");
                     }
                     //定义是否完整
                     boolean complete = false;
@@ -1398,7 +1385,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         }
         //判断电子病历是否完成sysFlag = 2
         //查询电子病历采集任务
-        String sql2 = "SELECT FPAT_NO,FREC_ID,FFILE_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FPAT_NO = '"+jzh+"'";
+        String sql2 = "SELECT FPAT_NO,FREC_ID,FENTRY_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FPAT_NO = '"+jzh+"'";
         try {
             List<Map> selectList2 = OracleConnect.selectListConvertMap(sql2);
             if(!CollectionUtils.isEmpty(selectList2)) {
@@ -1408,10 +1395,17 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     //获取文件ID
                     String frecId = (String)map1.get("FREC_ID");
                     //获取最后时间
-                    String flogludate = (String)map1.get("FLOGLUDATE");
-                    Date flogluDate = judgeTime(flogludate, jzh, "MZ", "VIEW_DOCTOR_DATA_2");
+                    Date flogluDate = null;
+                    if(null != map1.get("FLOGLUDATE")) {
+                        try {
+                            flogluDate = (Date)map1.get("FLOGLUDATE");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            return Msg.fail("电子病历任务的时间格式不符合规范");
+                        }
+                    }
                     if(null == flogluDate){
-                        return Msg.fail("电子病历任务的时间格式不符合规范");
+                        return Msg.fail("电子病历任务的时间不能为空");
                     }
                     //定义是否完整
                     boolean complete = false;
@@ -1433,7 +1427,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                         if(StringUtils.isNotBlank(failResult)){
                             failResult.append(",");
                         }
-                        failResult.append(map1.get("FFILE_NAME"));
+                        failResult.append(map1.get("FENTRY_NAME"));
                     }
                 }
             }

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

@@ -654,7 +654,7 @@ function save(successCount,failSelects){
     var role = $("#role").val();
     var lockInfo = $("#result").val();
     var id = $("#archiveId").val();
-    /*$.ajax({
+    $.ajax({
         url: path+"/beHosp/updateStateByArchivId",
         type: "POST",
         data: {id: id, remark: firstTrial,archivestate:archivestate, isSuccess:isSuccess,status: roleCode,roles:role,formToken:$("#formToken").val(),lockInfo:lockInfo},
@@ -686,7 +686,7 @@ function save(successCount,failSelects){
                 toastr.error(data.msg);
             }
         }
-    });*/
+    });
 }
 
 //实时查询各个采集任务是否采集完成