Explorar o código

Merge remote-tracking branch 'origin/dev/20210326_2.0.2' into dev/20210326_2.0.2

zhanghang %!s(int64=4) %!d(string=hai) anos
pai
achega
5165e99192
Modificáronse 1 ficheiros con 1 adicións e 6 borrados
  1. 1 6
      src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

+ 1 - 6
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -22,7 +22,6 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -324,7 +323,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<RecordContentDTO> recordContentDTOList = medicalRecordFacade.getRecordContentFac(recordContentVO);
         String recTitle = "";
         // 解密数据
-        if (false  && encryptFlag) {
+        if (encryptFlag) {
             try {
                 EncrypDES encrypDES = new EncrypDES();
                 for (RecordContentDTO recordContentDTO : recordContentDTOList) {
@@ -2213,7 +2212,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         //保存
         Map<String, Object> pageMap = outputInfo.getPageData();
         //保存解析过后的手术知情同意书
-        try {
             List<String> recIds = new ArrayList<>();
             if(pageMap.containsKey("手术知情同意书")){
                 Object informObject = pageMap.get("手术知情同意书");
@@ -2246,9 +2244,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     strInformedConsentServiceImpl.saveBatch(strInformedConsents);
                 }
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         // 手动拼接数据【知情同意书】【谈话告知书】
         List<MedicalRecord> recordList = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())