Browse Source

测试环境

xiaochan 1 năm trước cách đây
mục cha
commit
b70841d9b4

+ 1 - 4
src/main/java/thyyxxk/webserver/service/jiekou/MedicalTechnologyIsPaidService.java

@@ -3,9 +3,6 @@ package thyyxxk.webserver.service.jiekou;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.BizException;
@@ -16,7 +13,6 @@ import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
 import thyyxxk.webserver.service.hospitalizationCosts.HospitalizationCostsService;
-import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.ListUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
@@ -35,6 +31,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@DS("${environment}")
 public class MedicalTechnologyIsPaidService {
     private final DuiWaiJieKouDao dao;
     private final HospitalizationCostsService hospitalizationCostsService;

+ 5 - 4
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -548,22 +548,23 @@ public class YiZhuLuRuServer {
         SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
         YiZhuLuRuDao mapper = sqlSession.getMapper(YiZhuLuRuDao.class);
 
-        resList.forEach(item -> {
+        for (XinZhenYzActOrder item : resList) {
             setTempInfo(drug, item, patInfo);
             item.setActOrderNo(publicServer.getActOrderNo());
             returnOrderList.add(item.getActOrderNo());
             mapper.insertEntryOrder(patInfo, item, userCode);
 
             if (ListUtil.notBlank(item.getChildren())) {
-                item.getChildren().forEach(children -> {
+                for (XinZhenYzActOrder children : item.getChildren()) {
                     setTempInfo(drug, children, patInfo);
                     children.setActOrderNo(publicServer.getActOrderNo());
                     returnOrderList.add(children.getActOrderNo());
                     children.setParentNo(item.getActOrderNo());
                     mapper.insertEntryOrder(patInfo, children, userCode);
-                });
+                }
             }
-        });
+        }
+
 
         sqlSession.commit();
         sqlSession.close();

+ 1 - 0
src/main/resources/application-prod.yml

@@ -86,6 +86,7 @@ forest:
     socketCenter: http://172.16.32.160:8707/socketApi
 
 execute-scheduled: true
+environment: his
 
 triage-notify-url: http://172.16.32.160:8082/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter

+ 2 - 1
src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
     cache: false
   datasource:
     dynamic:
-      primary: dev
+      primary: his
       strict: false
       datasource:
         his:
@@ -108,6 +108,7 @@ si-injury-fee-url: http://172.16.32.163:2100/siInjury
 #si-injury-systm-url: http://172.16.32.163:2000/siInjury
 thmz-api-url: http://172.16.32.160:81/thmz/api/v1
 
+environment: dev
 
 #测试环境
 #si-api-url: http://10.93.30.130:20001/isp-api/powercsb/1101