Quellcode durchsuchen

处理webservice接口异常,数据处理逻辑

malz vor 1 Jahr
Ursprung
Commit
bdc46e6afa

+ 0 - 4
src/main/java/com/hgwebservice/scheduledTask/ScheduledTask.java

@@ -44,7 +44,6 @@ public class ScheduledTask {
     @Scheduled(cron ="0 0/10 * * * ?")
     public void sync1() {
         DateTime beginTime = DateTime.now();
-        log.info("===========开始同步患者数据===========");
         syncPatientDataByDeptCode.saveCdm2();
         DateTime endTime = DateTime.now();
         long between = DateUtil.between(beginTime, endTime, DateUnit.SECOND);
@@ -55,7 +54,6 @@ public class ScheduledTask {
     @Scheduled(cron ="0 0/5 * * * ?")
     public void syncDispatch() {
         DateTime beginTime = DateTime.now();
-        log.info("===========开始同步医嘱数据===========");
         syncDispatchDataByDeptCode.saveCdm2();
         DateTime endTime = DateTime.now();
         long between = DateUtil.between(beginTime, endTime, DateUnit.SECOND);
@@ -66,7 +64,6 @@ public class ScheduledTask {
 //    @Scheduled(cron ="0 0/3 * * * ?")
     public void sync2() {
         DateTime beginTime = DateTime.now();
-        log.info("===========开始同步华广量测数据===========");
         String start="2024-03-15 00:00:00";
         String end="2024-03-15 23:59:59";
         measureService.dmsMeasure(start,end);
@@ -80,7 +77,6 @@ public class ScheduledTask {
     public void sync3() {
         if (returnHisMeasureEnable){
             DateTime beginTime = DateTime.now();
-            log.info("===========开始回写患者量测数据===========");
             measureService.measure();
             DateTime endTime = DateTime.now();
             long between = DateUtil.between(beginTime, endTime, DateUnit.SECOND);

+ 2 - 6
src/main/java/com/hgwebservice/service/syncCdm2/SyncDispatchDataByDeptCodeImpl.java

@@ -85,7 +85,8 @@ public class SyncDispatchDataByDeptCodeImpl implements SyncDispatchDataByDeptCod
                             operatorDataMapper.insertDispatchData(dispatchDataDOS,hospitalId);
                         }
 
-                    }else{
+                    }
+                    if (dispatchData!=null && dispatchData.size()==0){
                         List<Integer> ids = dispatchDataDOS1.stream().filter(item -> item.getPatientNo().equals(patientDataDO.getPatientNo())).map(DispatchDataDO::getId).collect(Collectors.toList());
                         if (CollUtil.isNotEmpty(ids)){
                             dispatchDataMapper.deleteBatchIds(ids);
@@ -96,10 +97,5 @@ public class SyncDispatchDataByDeptCodeImpl implements SyncDispatchDataByDeptCod
                     syncDispatchInfoByDeptCode.saveCdm2(dispatchData,patientDataDO.getPatientNo(),dispatchInfoDOList);
                 }
         }
-//        List<DispatchData> dispatchData = hgWebService.getDispatchDataByDeptCode("55");
-//        if (CollUtil.isNotEmpty(dispatchData)){
-//            List<DispatchDataDO> dispatchDataDOS = BeanUtil.copyToList(dispatchData, DispatchDataDO.class);
-//            operatorDataMapper.replaceDispatchData(dispatchDataDOS,hospitalId);
-//        }
     }
 }

+ 3 - 6
src/main/java/com/hgwebservice/service/syncCdm2/SyncDispatchInfoByDeptCodeImpl.java

@@ -79,16 +79,13 @@ public class SyncDispatchInfoByDeptCodeImpl implements SyncDispatchInfoByDeptCod
                             List<DispatchInfoDO> dispatchDataDOS = BeanUtil.copyToList(insertDispatchInfo, DispatchInfoDO.class);
                             operatorDataMapper.insertDispatchInfo(dispatchDataDOS,hospitalId);
                         }
-                    }else{
+                    }
+
+                    if (dispatchDataParam!=null && dispatchDataParam.size()==0){
                         List<Integer> ids = dispatchInfoDOS.stream().filter(item -> item.getPatientCode().equals(patientNo)).map(DispatchInfoDO::getId).collect(Collectors.toList());
                         if (CollUtil.isNotEmpty(ids)){
                             dispatchInfoMapper.deleteBatchIds(ids);
                         }
                     }
-//        List<DispatchData> dispatchData = hgWebService.getDispatchDataByDeptCode("55");
-//        if (CollUtil.isNotEmpty(dispatchData)){
-//            List<DispatchDataDO> dispatchDataDOS = BeanUtil.copyToList(dispatchData, DispatchDataDO.class);
-//            operatorDataMapper.replaceDispatchData(dispatchDataDOS,hospitalId);
-//        }
     }
 }

+ 7 - 7
src/main/java/com/hgwebservice/util/SoapUtil.java

@@ -35,7 +35,7 @@ public class SoapUtil {
     }
 
     public static Document generatorWebserviceBySoap(String soapPrefix, String endPointURL, String action, String cdata) throws Exception {
-        log.info("Soap util");
+//        log.info("Soap util");
         Document doc = null;
         SOAPConnectionFactory soapConnectionFactory = SOAPConnectionFactory.newInstance();
         SOAPConnection soapConnection = soapConnectionFactory.createConnection();
@@ -108,7 +108,7 @@ public class SoapUtil {
     }
 
     public static Document GeneratorWebserviceBySoap(String soapPrefix, String endPointURL, String namespace, String methodName, String soapActionURI, String[] inputNames, String[] inputValues, String tagName) throws Exception {
-        log.info("Use mawei soap util");
+//        log.info("Use mawei soap util");
         Document doc = null;
         SOAPConnectionFactory soapConnectionFactory = SOAPConnectionFactory.newInstance();
         SOAPConnection soapConnection = soapConnectionFactory.createConnection();
@@ -158,7 +158,7 @@ public class SoapUtil {
     }
 
     public static String GeneratorWebserviceBySoapResultUpload(String soapPrefix, String endPointURL, String namespace, String methodName, String soapActionURI, String[] inputNames, String[] inputValues, String tagName) throws Exception {
-        log.info("Use mawei soap util");
+//        log.info("Use mawei soap util");
         SOAPConnectionFactory soapConnectionFactory = SOAPConnectionFactory.newInstance();
         SOAPConnection soapConnection = soapConnectionFactory.createConnection();
         MessageFactory messageFactory = MessageFactory.newInstance("SOAP 1.2 Protocol");
@@ -185,13 +185,13 @@ public class SoapUtil {
             ByteArrayOutputStream out_req = new ByteArrayOutputStream();
             ByteArrayOutputStream out_res = new ByteArrayOutputStream();
             soapRequest.writeTo(out_req);
-            log.info("SOAP Request:");
-            log.info(new String(out_req.toByteArray()));
+//            log.info("SOAP Request:");
+//            log.info(new String(out_req.toByteArray()));
             SOAPMessage soapResponse = soapConnection.call(soapRequest, endPointURL);
             soapResponse.writeTo(out_res);
             soapConnection.close();
-            log.info("SOAP Response:");
-            log.info(new String(out_res.toByteArray()));
+//            log.info("SOAP Response:");
+//            log.info(new String(out_res.toByteArray()));
             SOAPBody resBody = soapResponse.getSOAPBody();
             result = resBody.getElementsByTagName(tagName).item(0).getFirstChild().getNodeValue();
         }

+ 7 - 6
src/main/java/com/hgwebservice/util/WebServiceUtil.java

@@ -114,7 +114,7 @@ public class WebServiceUtil {
             return allPatientDataList;
         } catch (Exception var18) {
             log.error("Get PatientDataByWardCode Fail !!! ", var18);
-            return allPatientDataList;
+            return null;
         }
     }
 
@@ -194,11 +194,12 @@ public class WebServiceUtil {
                     }
                 }
             }
-
-//            log.info("获取有效医嘱" + dispatcList.size());
+            if (dispatcList.size()>0){
+                log.info(visitNo+"获取有效医嘱" + dispatcList.size());
+            }
             return dispatcList;
         } catch (Exception var20) {
-            log.error("Get AllOperatorData Fail !!! ", var20);
+            log.error("Get DispatchData Fail !!! ", var20);
             return null;
         }
     }
@@ -417,8 +418,8 @@ public class WebServiceUtil {
         sb.append(patientNo);
         sb.append(lt + "/visitNo" + gt);
         sb.append(lt + "/root>]]>");
-        log.info("RequestXml:" + sb.toString());
-        log.info("");
+//        log.info("RequestXml:" + sb.toString());
+//        log.info("");
         String[] sa = new String[]{sb.toString()};
         return sa[0];
     }