gaodm 5 роки тому
батько
коміт
4e92534499

+ 13 - 0
src/main/java/com/diagbot/entity/QcresultDetail.java

@@ -55,6 +55,11 @@ public class QcresultDetail implements Serializable {
      */
     private BigDecimal score;
 
+    /**
+     * 条目提示信息
+     */
+    private String msg;
+
     /**
      * 单项否决(1-单项否决 0-非)
      */
@@ -146,6 +151,14 @@ public class QcresultDetail implements Serializable {
         this.score = score;
     }
 
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
     public Integer getIsReject() {
         return isReject;
     }

+ 4 - 4
src/main/java/com/diagbot/facade/AlgorithmFacade.java

@@ -142,12 +142,12 @@ public class AlgorithmFacade {
                 }
                 //单票否决计分
                 if (qcResultAlgVO.getIsReject().equals(1)) {
-                    rejectScore.add(qcResultAlgVO.getScore());
+                    rejectScore = rejectScore.add(qcResultAlgVO.getScore());
                 } else {
                     //非单票否决计分
                     if (casesScoreMap.containsKey(qcResultAlgVO.getCasesId())) {
                         BigDecimal casesScore = casesScoreMap.get(qcResultAlgVO.getCasesId());
-                        casesScore.add(qcResultAlgVO.getScore());
+                        casesScore= casesScore.add(qcResultAlgVO.getScore());
                         casesScoreMap.put(qcResultAlgVO.getCasesId(), casesScore);
                     }
                 }
@@ -163,9 +163,9 @@ public class AlgorithmFacade {
                 for (Map.Entry<Long, BigDecimal> casesScore : casesScoreMap.entrySet()) {
                     BigDecimal allSccore = casesMap.get(casesScore.getKey());
                     if (BigDecimalUtil.compareTo(allSccore, casesScore.getValue()) == 5) {
-                        res.subtract(allSccore);
+                        res = res.subtract(allSccore);
                     } else {
-                        res.subtract(casesScore.getValue());
+                        res = res.subtract(casesScore.getValue());
                     }
                 }
             }

+ 2 - 0
src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -129,6 +129,8 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
             for (QcResultAlgVO qcResultAlgVO : qcResultAlgVORes) {
                 QcresultDetail qcresultDetail = new QcresultDetail();
                 BeanUtil.copyProperties(qcResultAlgVO, qcresultDetail);
+                qcresultDetail.setHospitalId(analyzeVO.getHospitalId());
+                qcresultDetail.setBehospitalCode(analyzeVO.getBehospitalCode());
                 qcresultDetail.setGmtCreate(now);
                 qcresultDetail.setCreator(useId.toString());
                 qcresultDetail.setGmtModified(now);