|
@@ -465,12 +465,12 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<String> getUniqueNames(StaticKnowledgeHISVO staticKnowledgeHISVO) {
|
|
|
- String hospitalId = SysUserUtils.getCurrentHospitalID();
|
|
|
+ Long hospitalId = staticKnowledgeHISVO.getHospitalId();
|
|
|
List<String> nameList = null;
|
|
|
switch (staticKnowledgeHISVO.getType()) {
|
|
|
case 1:
|
|
|
Map<String, Map<String, Long>> disConfigMap
|
|
|
- = diseaseConfigFacade.getConfigMap(Long.valueOf(hospitalId),
|
|
|
+ = diseaseConfigFacade.getConfigMap(hospitalId,
|
|
|
ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }), null);
|
|
|
if (disConfigMap != null) {
|
|
|
nameList = new ArrayList<>(disConfigMap.get(staticKnowledgeHISVO.getHisName()).keySet());
|
|
@@ -478,7 +478,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
break;
|
|
|
case 2:
|
|
|
Map<String, Map<String, Long>> drugConfigMap
|
|
|
- = drugConfigFacade.getConfigMapWithoutForm(Long.valueOf(hospitalId),
|
|
|
+ = drugConfigFacade.getConfigMapWithoutForm(hospitalId,
|
|
|
ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }), null);
|
|
|
if (drugConfigMap != null) {
|
|
|
nameList = new ArrayList<>(drugConfigMap.get(staticKnowledgeHISVO.getHisName()).keySet());
|
|
@@ -487,7 +487,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
case 3:
|
|
|
case 4:
|
|
|
Map<String, Map<String, Map<String, Long>>> lisConfigMap
|
|
|
- = lisConfigFacade.getConfigMap(Long.valueOf(hospitalId),
|
|
|
+ = lisConfigFacade.getConfigMap(hospitalId,
|
|
|
ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }), null);
|
|
|
if (lisConfigMap != null) {
|
|
|
if (StringUtil.isBlank(staticKnowledgeHISVO.getHisDetailName())) {
|
|
@@ -503,7 +503,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
break;
|
|
|
case 5:
|
|
|
Map<String, Map<String, Long>> pacsConfigMap
|
|
|
- = pacsConfigFacade.getConfigMap(Long.valueOf(hospitalId),
|
|
|
+ = pacsConfigFacade.getConfigMap(hospitalId,
|
|
|
ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }), null);
|
|
|
if (pacsConfigMap != null) {
|
|
|
nameList = new ArrayList<>(pacsConfigMap.get(staticKnowledgeHISVO.getHisName()).keySet());
|
|
@@ -511,7 +511,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
break;
|
|
|
case 6:
|
|
|
Map<String, Map<String, Long>> operationConfigMap
|
|
|
- = operationConfigFacade.getConfigMap(Long.valueOf(hospitalId),
|
|
|
+ = operationConfigFacade.getConfigMap(hospitalId,
|
|
|
ListUtil.arrayToList(new String[] { staticKnowledgeHISVO.getHisName() }), null);
|
|
|
if (operationConfigMap != null) {
|
|
|
nameList = new ArrayList<>(operationConfigMap.get(staticKnowledgeHISVO.getHisName()).keySet());
|