|
@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import thyyxxk.webserver.config.Assertion;
|
|
import thyyxxk.webserver.config.Assertion;
|
|
|
|
+import thyyxxk.webserver.config.envionment.ArchiveConfig;
|
|
import thyyxxk.webserver.config.envionment.CaData;
|
|
import thyyxxk.webserver.config.envionment.CaData;
|
|
import thyyxxk.webserver.config.exception.BizException;
|
|
import thyyxxk.webserver.config.exception.BizException;
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
@@ -62,10 +63,10 @@ public class CaServer implements Assertion {
|
|
|
|
|
|
RSA idCardRsa = new RSA(privateKey, publicKey);
|
|
RSA idCardRsa = new RSA(privateKey, publicKey);
|
|
|
|
|
|
- public CaServer(CaData caData, EmrPatientDao emrPatientDao, String archivePath, CaCache cache, UserCache userCache, PatientIdCardTypeDao patientIdCardTypeDao) {
|
|
|
|
|
|
+ public CaServer(CaData caData, EmrPatientDao emrPatientDao, CaCache cache, UserCache userCache, ArchiveConfig archive, PatientIdCardTypeDao patientIdCardTypeDao) {
|
|
this.caData = caData;
|
|
this.caData = caData;
|
|
this.emrPatientDao = emrPatientDao;
|
|
this.emrPatientDao = emrPatientDao;
|
|
- this.archivePath = archivePath;
|
|
|
|
|
|
+ this.archivePath = archive.getPath() + "/emr";
|
|
this.cache = cache;
|
|
this.cache = cache;
|
|
this.userCache = userCache;
|
|
this.userCache = userCache;
|
|
this.patientIdCardTypeDao = patientIdCardTypeDao;
|
|
this.patientIdCardTypeDao = patientIdCardTypeDao;
|