内容调整

data-service/pom.xml

@@ -42,11 +42,46 @@
             <artifactId>common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+            <!--<scope>provided</scope>-->
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.62</version>
-            <scope>compile</scope>
+            <version>1.2.79</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+
+        <!-- JSON序列化/反序列化工具 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.12.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.12.3</version>
         </dependency>
 
         <!-- 开启web-->
@@ -65,14 +100,6 @@
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
-            <!--<scope>provided</scope>-->
-        </dependency>
-
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -204,11 +231,6 @@
             <version>${mysql-connector-java.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
-        </dependency>
 
         <dependency>
             <groupId>io.github.lvyahui8</groupId>

data-service/src/main/java/com/lantone/data/facade/data/HomeOperationInfoFacade.java

@@ -1,6 +1,5 @@
 package com.lantone.data.facade.data;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Lists;
@@ -15,7 +14,6 @@ import com.lantone.data.vo.DeleteFlagVO;
 import com.lantone.data.vo.data.HomeOperationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

data-service/src/main/java/com/lantone/data/facade/data/HomePageFacade.java

@@ -43,12 +43,6 @@ public class HomePageFacade extends HomePageServiceImpl {
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
-    @Autowired
-    private ReadProperties readProperties;
-
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
     @Value("${xml_analyse.enable}")
     private boolean xmlAnalyse;
 
@@ -144,8 +138,6 @@ public class HomePageFacade extends HomePageServiceImpl {
         Long modeId=Long.valueOf("6");//病案首页默认为6
         if(aHomePageIngVO.getDockModeType().equals("0")){
             Map<String,Object> map=new HashMap<String,Object>();
-            List<HomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
-            map.put("homePages",homePageDtoList);
             return RespDTO.onSuc(map);
         }else if(aHomePageIngVO.getDockModeType().equals("1")){
             //页面模式

data-service/src/main/java/com/lantone/data/facade/data/MedCrisisFacade.java

@@ -2,40 +2,39 @@ package com.lantone.data.facade.data;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.MedCrisisInfo;
 import com.lantone.data.util.BeanUtil;
 import com.lantone.data.util.DateUtil;
+import com.lantone.data.vo.data.MedCrisisVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 
 @Component
+@Slf4j
 public class MedCrisisFacade extends MedCrisisInfoServiceImpl {
 
     @Autowired
     @Qualifier("medCrisisInfoServiceImpl")
     private MedCrisisInfoServiceImpl medCrisisInfoService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
-    public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
+    public RespDTO executeMedCrisis(List<MedCrisisVO> list) {
         try{
             if (list != null && list.size() > 0) {
                 //循环验证数据有效性
-                for (AMedCrisisVO aMedCrisisVO : list) {
-                    if ("".equals(aMedCrisisVO.getRecId())) {
+                for (MedCrisisVO medCrisisVO : list) {
+                    if ("".equals(medCrisisVO.getRecId())) {
                         return RespDTO.onError("请输入文书编码!");
-                    } else if ("".equals(aMedCrisisVO.getBehospitalCode())) {
+                    } else if ("".equals(medCrisisVO.getBehospitalCode())) {
                         return RespDTO.onError("请输入病人住院编码!");
-                    } else if (aMedCrisisVO.getHospitalId() == null) {
+                    } else if (medCrisisVO.getHospitalId() == null) {
                         return RespDTO.onError("请输入医院编码!");
-                    } else if ("".equals(aMedCrisisVO.getRecType())) {
+                    } else if ("".equals(medCrisisVO.getRecType())) {
                         return RespDTO.onError("请输入危急值类型!");
                     }
                 }
@@ -50,18 +49,12 @@ public class MedCrisisFacade extends MedCrisisInfoServiceImpl {
                 });
                 execute(medCrisisList);
 
-                if(logSwitch){
-                    medCrisisList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("危急值信息-正常","", JSON.toJSONString(list),"","");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             } else {
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值信息-异常","", JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -86,7 +79,6 @@ public class MedCrisisFacade extends MedCrisisInfoServiceImpl {
                     }
                 } catch (Exception e) {
                     log.error(e.getMessage(), e);
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析", s.getRecId(), JSON.toJSONString(medCrisisList), "", e.getMessage());
                 }
             });
         }

data-service/src/main/java/com/lantone/data/facade/dataView/ViewDoctorInfoFacade.java

@@ -1,6 +1,5 @@
 package com.lantone.data.facade.dataView;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.data.entity.BasDoctorInfo;
 import com.lantone.data.entity.his.VLtDoctorInfo;

data-service/src/main/java/com/lantone/data/facade/dataView/ViewRecordTypeFacade.java

@@ -7,6 +7,7 @@ import com.lantone.data.service.impl.his.VLtRecordTypeServiceImpl;
 import com.lantone.data.util.BeanUtil;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.RedisUtil;
+import com.nimbusds.oauth2.sdk.id.Actor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;