|
@@ -25,7 +25,6 @@ import com.diagbot.entity.DoctorAdvice;
|
|
|
import com.diagbot.entity.HomeDiagnoseInfo;
|
|
|
import com.diagbot.entity.HomeOperationInfo;
|
|
|
import com.diagbot.entity.HomePage;
|
|
|
-import com.diagbot.entity.QcModelHospital;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -198,7 +197,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 评分-终末质控
|
|
|
+ *
|
|
|
+ * @param analyzeVO
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public AnalyzeDTO analyze(AnalyzeVO analyzeVO) {
|
|
|
Long hospitalId = analyzeVO.getHospitalId();
|
|
|
if (!analyzeVO.getIsTask()) {
|
|
@@ -209,7 +213,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
// 获取质控条目
|
|
|
List<QcCasesEntryDTO> qcCasesEntryDTOList = qcCasesEntryFacade.getQcCasesEntry(analyzeVO);
|
|
|
if(ListUtil.isEmpty(qcCasesEntryDTOList)){
|
|
|
- throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历找不到质控条目!");
|
|
|
+ throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历无关联的质控条目!");
|
|
|
}
|
|
|
|
|
|
// 获取病历所有数据
|
|
@@ -782,6 +786,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 评分-运行质控
|
|
|
+ *
|
|
|
+ * @param analyzeRunVO
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public AnalyzeRunDTO analyzeRun(AnalyzeRunVO analyzeRunVO) {
|
|
|
AnalyzeVO analyzeVO = new AnalyzeVO();
|
|
|
BeanUtil.copyProperties(analyzeRunVO, analyzeVO);
|
|
@@ -790,7 +800,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
// 获取质控条目
|
|
|
List<QcCasesEntryDTO> qcCasesEntryDTOList = qcCasesEntryFacade.getQcCasesEntry(analyzeVO);
|
|
|
if(ListUtil.isEmpty(qcCasesEntryDTOList)){
|
|
|
- throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历找不到质控条目!");
|
|
|
+ throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历无关联的质控条目!");
|
|
|
}
|
|
|
|
|
|
// 获取病历所有数据
|
|
@@ -904,7 +914,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
OutputInfo outputInfo = response.getData();
|
|
|
//根据质控结果获取质控条目
|
|
|
- QcResultAlgQueryVO qcResultAlgQueryVO = new QcResultAlgQueryVO();
|
|
|
+ // QcResultAlgQueryVO qcResultAlgQueryVO = new QcResultAlgQueryVO();
|
|
|
List<String> codeList = new ArrayList<>();
|
|
|
// code和info的映射map
|
|
|
Map<String, String> codeToInfoMap = new LinkedHashMap<>();
|
|
@@ -916,18 +926,18 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
codeToInfoMap.put(key, mapInfo.get("info"));
|
|
|
}
|
|
|
}
|
|
|
- List<QcResultAlgVO> qcResultAlgVOList = new ArrayList<>();
|
|
|
- if (ListUtil.isNotEmpty(codeList)) {
|
|
|
- qcResultAlgQueryVO.setCodeList(codeList);
|
|
|
- qcResultAlgQueryVO.setHospitalId(hospitalId);
|
|
|
- qcResultAlgVOList = qcCasesEntryFacade.getQcResultAlgVO(qcResultAlgQueryVO);
|
|
|
- }
|
|
|
-
|
|
|
- // 评分
|
|
|
- AlgorithmVO algorithmVO = new AlgorithmVO();
|
|
|
- algorithmVO.setType(0);
|
|
|
- algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
|
|
|
- AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
|
|
|
+ // List<QcResultAlgVO> qcResultAlgVOList = new ArrayList<>();
|
|
|
+ // if (ListUtil.isNotEmpty(codeList)) {
|
|
|
+ // qcResultAlgQueryVO.setCodeList(codeList);
|
|
|
+ // qcResultAlgQueryVO.setHospitalId(hospitalId);
|
|
|
+ // qcResultAlgVOList = qcCasesEntryFacade.getQcResultAlgVO(qcResultAlgQueryVO);
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // // 评分
|
|
|
+ // AlgorithmVO algorithmVO = new AlgorithmVO();
|
|
|
+ // algorithmVO.setType(0);
|
|
|
+ // algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
|
|
|
+ // AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
|
|
|
|
|
|
//保存
|
|
|
// Map<String, Object> pageMap = outputInfo.getPageData();
|
|
@@ -940,26 +950,15 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
// Date date = qcresultInfoFacade.saveQcResult(algorithmDTO, algorithmVO, analyzeVO, pageData, menuData, analyzeVO.getIsTask());
|
|
|
|
|
|
// 返回缺陷提示信息
|
|
|
- Map<String, List<MsgDTO>> msgMap = new LinkedHashMap<>();
|
|
|
- String selectMode = "";
|
|
|
+ List<MsgDTO> msgDTOList = new ArrayList<>();
|
|
|
if (ListUtil.isNotEmpty(codeList)) {
|
|
|
AnalyzeCodeVO analyzeCodeVO = new AnalyzeCodeVO();
|
|
|
analyzeCodeVO.setCodeList(codeList);
|
|
|
analyzeCodeVO.setHospitalId(hospitalId);
|
|
|
- Map<String, QcModelHospital> qcModelHospitalMap = qcModelHospitalFacade.getHospitalModel();
|
|
|
- if (qcModelHospitalMap.containsKey(hospitalId + "##" + analyzeRunVO.getHosModelname())) {
|
|
|
- QcModelHospital qcModelHospital = qcModelHospitalMap.get(hospitalId + "##" + analyzeRunVO.getHosModelname());
|
|
|
- if (qcModelHospital != null) {
|
|
|
- selectMode = qcModelHospital.getStandModelName();
|
|
|
- // 1:筛选相应的模块内容,其他值:获取全部
|
|
|
- if (1 == analyzeRunVO.getFlag()) {
|
|
|
- analyzeCodeVO.setModeId(qcModelHospital.getStandModelId());
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ analyzeCodeVO.setModeId(analyzeRunVO.getModeId());
|
|
|
|
|
|
// 获取缺陷条目信息
|
|
|
- List<MsgDTO> msgDTOList = getMsgByEntryCode(analyzeCodeVO);
|
|
|
+ msgDTOList = getMsgByEntryCode(analyzeCodeVO);
|
|
|
// 设置info信息
|
|
|
if (codeToInfoMap != null && !codeToInfoMap.isEmpty()) {
|
|
|
for (MsgDTO msgDTO : msgDTOList) {
|
|
@@ -969,15 +968,13 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- msgMap = EntityUtil.makeEntityListMap(msgDTOList, "modelName");
|
|
|
}
|
|
|
|
|
|
//返回参数组装
|
|
|
AnalyzeRunDTO analyzeRunDTO = new AnalyzeRunDTO();
|
|
|
- analyzeRunDTO.setScoreRes(algorithmDTO.getScore());
|
|
|
- analyzeRunDTO.setLevel(algorithmDTO.getLevel());
|
|
|
- analyzeRunDTO.setMsgMap(msgMap);
|
|
|
- analyzeRunDTO.setSelectMode(selectMode);
|
|
|
+ // analyzeRunDTO.setScoreRes(algorithmDTO.getScore());
|
|
|
+ // analyzeRunDTO.setLevel(algorithmDTO.getLevel());
|
|
|
+ analyzeRunDTO.setMsgDTOList(msgDTOList);
|
|
|
return analyzeRunDTO;
|
|
|
}
|
|
|
|