|
|
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.nb.auth.utils.SecurityUtil;
|
|
|
+import com.nb.web.api.HospitalProperties;
|
|
|
import com.nb.web.api.bean.GeoPoint;
|
|
|
import com.nb.web.api.entity.BusHospitalConfigEntity;
|
|
|
import com.nb.web.api.feign.IHospitalClient;
|
|
|
@@ -54,6 +55,9 @@ import java.util.stream.Collectors;
|
|
|
*/
|
|
|
@Service
|
|
|
public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusHospitalEntity,String> implements CommandLineRunner, GetNameInterface<String,String>, HospitalCodeCheck, IHospitalClient {
|
|
|
+ @Autowired
|
|
|
+ private HospitalProperties hospitalProperties;
|
|
|
+
|
|
|
@Autowired
|
|
|
@Lazy
|
|
|
private ConfigStorageManager configStorageManager;
|
|
|
@@ -94,7 +98,9 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
|
|
|
entity.setStrategy(HisStrategyEnum.NONE);
|
|
|
}
|
|
|
entity.setScriptOnline(false);
|
|
|
- entity.setCode(CodeUtils.genInviteCode(id));
|
|
|
+ if(StrUtil.isBlank(entity.getCode())){
|
|
|
+ entity.setCode(CodeUtils.genInviteCode(id));
|
|
|
+ }
|
|
|
entity.setId(String.valueOf(id));
|
|
|
}
|
|
|
|
|
|
@@ -222,7 +228,8 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
|
|
|
private void saveDefaultHospital(){
|
|
|
BusHospitalEntity hospital = new BusHospitalEntity();
|
|
|
hospital.setId("1");
|
|
|
- hospital.setName("驼人医疗器械有限公司");
|
|
|
+ hospital.setName(StrUtil.isNotBlank(hospitalProperties.getName())?hospitalProperties.getName():"驼人医疗器械有限公司");
|
|
|
+ hospital.setCode(hospitalProperties.getCode());
|
|
|
hospital.setRemark("系统级医院,不可删除、修改");
|
|
|
GeoPoint geoPoint = new GeoPoint();
|
|
|
geoPoint.setLon("35.135106");
|