|
@@ -156,6 +156,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
MedTransferRecordFacade medTransferRecordFacade;
|
|
|
@Autowired
|
|
|
MedNurseFacade medNurseFacade;
|
|
|
+ @Autowired
|
|
|
+ SysHospitalSetFacade sysHospitalSetFacade;
|
|
|
+
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -974,7 +977,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
analyzeVO.setHospitalId(hospitalId);
|
|
|
|
|
|
// 处理公共数据
|
|
|
-
|
|
|
QueryVo queryVo = dealCommonData(hospitalId, analyzeVO);
|
|
|
queryVo.setUseCrfCache(analyzeVO.isUseCrfCache());
|
|
|
// 调用质控接口
|
|
@@ -1581,10 +1583,21 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
.select("behospital_code", "level", "score_res"));
|
|
|
BigDecimal bigDecimal = new BigDecimal(0);
|
|
|
BigDecimal res = new BigDecimal(120);
|
|
|
+ String reNum = "0";
|
|
|
+ SysHospitalSet sysHospitalSet
|
|
|
+ = sysHospitalSetFacade.getOne(new QueryWrapper<SysHospitalSet>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("hospital_id", analyzeRunVO.getHospitalId())
|
|
|
+ , false);
|
|
|
+ if (null != sysHospitalSet
|
|
|
+ && sysHospitalSet.getValue().equals("1")) {
|
|
|
+ //百分制
|
|
|
+ reNum = "1";
|
|
|
+ }
|
|
|
if(null != qcresultInfo){
|
|
|
analyzeRunDTO.setLevel(qcresultInfo.getLevel()==null?"":qcresultInfo.getLevel());
|
|
|
analyzeRunDTO.setScoreRes(qcresultInfo.getScoreRes() ==null ? bigDecimal : qcresultInfo.getScoreRes());
|
|
|
- if(analyzeRunVO.getHospitalId()==1) {
|
|
|
+ if("1".equals(reNum)) {
|
|
|
bigDecimal = res.subtract(analyzeRunDTO.getScoreRes());
|
|
|
}else{
|
|
|
bigDecimal = res.subtract(analyzeRunDTO.getScoreRes().multiply(new BigDecimal(1.2)));
|