计分运行与终末分离修改

src/main/java/com/diagbot/facade/AlgorithmFacade.java

@@ -6,6 +6,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.BigDecimalUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.AlgorithmVO;
 import com.diagbot.vo.MedQcresultCasesVO;
 import com.diagbot.vo.QcResultAlgVO;
@@ -117,7 +118,10 @@ public class AlgorithmFacade {
                 .multiply(new BigDecimal(100))
                 .divide(new BigDecimal(120), 1, RoundingMode.HALF_UP);
         // 判断是否是百分制
-        if (sysHospitalSetFacade.getScoreType(algorithmVO.getHospitalId()).equals("1")) {
+        if (sysHospitalSetFacade.getScoreType(algorithmVO.getHospitalId()).equals("1")
+                ||(algorithmVO.getHospitalId().intValue() == 1
+                && StringUtil.isNotBlank(algorithmVO.getIsPlacefile())
+                && algorithmVO.getIsPlacefile().equals("0"))) {
             res = cal(algorithmVO);
         }
         return res;

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -1229,6 +1229,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         algorithmVO.setHospitalId(hospitalId);
         algorithmVO.setBehospitalCode(analyzeVO.getBehospitalCode());
         algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
+        algorithmVO.setIsPlacefile(isPlacefile);
         AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
 
         //保存

src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -69,13 +69,13 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
 
         Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
         //验证病历的存在性
-        Integer mrcnt
-                = behospitalInfoFacade.count(
+        List<BehospitalInfo> behospitalInfos
+                = behospitalInfoFacade.list(
                 new QueryWrapper<BehospitalInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", hospitalId)
                         .eq("behospital_code", qcresultVO.getBehospitalCode()));
-        if (mrcnt < 1) {
+        if (behospitalInfos.size() != 1) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该医院下该病历号不存在！");
         }
         //验证是否评估过
@@ -106,6 +106,7 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
         algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
         algorithmVO.setHospitalId(hospitalId);
         algorithmVO.setBehospitalCode(qcresultVO.getBehospitalCode());
+        algorithmVO.setIsPlacefile(behospitalInfos.get(0).getIsPlacefile());
         AlgorithmDTO algorithmDTO = algorithmFacade.getAlgorithmRes(algorithmVO);
         //更新质控评分结果信息
         AnalyzeVO analyzeVO = new AnalyzeVO();

src/main/java/com/diagbot/vo/AlgorithmVO.java

@@ -30,4 +30,6 @@ public class AlgorithmVO {
     //是否病案首页
     private Boolean isHomePage = false;
     //-------长兴特殊算分用结束-----------
+
+    private String isPlacefile = "1";
 }