修改bug

mrman-service/src/main/java/com/diagbot/dto/GetAllByHospitalDetialDTO.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * @Description:
  * @author: wangyu
@@ -18,7 +20,7 @@ public class GetAllByHospitalDetialDTO {
     private String modeName;
     private String precond;
     private Long modeId;
-    private String score;
+    private BigDecimal score;
     private Integer isUsed;
     private Integer isReject;
     private String msg;

mrman-service/src/main/java/com/diagbot/dto/GetUpdateInfoDetialDTO.java

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * @Description:
  * @author: wangyu
@@ -12,7 +14,7 @@ import lombok.Setter;
 @Setter
 public class GetUpdateInfoDetialDTO {
     private String hospitalName;
-    private String score;
+    private BigDecimal score;
     private Integer isUsed;
     private String msg;
 }

mrman-service/src/main/java/com/diagbot/entity/CasesEntryHospital.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -56,35 +58,31 @@ public class CasesEntryHospital implements Serializable {
      */
     private Long casesEntryId;
 
-    private String hospitalId;
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
 
     /**
      * 扣分值
      */
-    private String score;
+    private BigDecimal score;
 
+    /**
+     * 条目提示信息
+     */
     private String msg;
 
+    /**
+     * 0-未启用 1-启用
+     */
     private Integer isUsed;
 
+    /**
+     * 单项否决（1-单项否决 0-非）
+     */
     private Integer isReject;
 
-    public Integer getIsReject() {
-        return isReject;
-    }
-
-    public void setIsReject(Integer isReject) {
-        this.isReject = isReject;
-    }
-
-    public Integer getIsUsed() {
-        return isUsed;
-    }
-
-    public void setIsUsed(Integer isUsed) {
-        this.isUsed = isUsed;
-    }
-
     /**
      * 备注
      */
@@ -139,18 +137,18 @@ public class CasesEntryHospital implements Serializable {
     public void setCasesEntryId(Long casesEntryId) {
         this.casesEntryId = casesEntryId;
     }
-    public String getHospitalId() {
+    public Long getHospitalId() {
         return hospitalId;
     }
 
-    public void setHospitalId(String hospitalId) {
+    public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
-    public String getScore() {
+    public BigDecimal getScore() {
         return score;
     }
 
-    public void setScore(String score) {
+    public void setScore(BigDecimal score) {
         this.score = score;
     }
     public String getMsg() {
@@ -160,6 +158,20 @@ public class CasesEntryHospital implements Serializable {
     public void setMsg(String msg) {
         this.msg = msg;
     }
+    public Integer getIsUsed() {
+        return isUsed;
+    }
+
+    public void setIsUsed(Integer isUsed) {
+        this.isUsed = isUsed;
+    }
+    public Integer getIsReject() {
+        return isReject;
+    }
+
+    public void setIsReject(Integer isReject) {
+        this.isReject = isReject;
+    }
     public String getRemark() {
         return remark;
     }
@@ -170,19 +182,20 @@ public class CasesEntryHospital implements Serializable {
 
     @Override
     public String toString() {
-        return "CasesEntryHospital{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", casesEntryId=" + casesEntryId +
-            ", hospitalId=" + hospitalId +
-            ", score=" + score +
-            ", msg=" + msg +
+        return "QcCasesEntryHospital{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", casesEntryId=" + casesEntryId +
+                ", hospitalId=" + hospitalId +
+                ", score=" + score +
+                ", msg=" + msg +
                 ", isUsed=" + isUsed +
-            ", remark=" + remark +
-        "}";
+                ", isReject=" + isReject +
+                ", remark=" + remark +
+                "}";
     }
 }

mrman-service/src/main/java/com/diagbot/facade/CasesEntryHospitalFacade.java

@@ -148,7 +148,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
             qcCasesEntry.setGmtModified(date);
             qcCacesEntryFacade.updateById(qcCasesEntry);
             //修改时添加明细前先删除
-            List<String> hospitalIds = new ArrayList<>();
+            List<Long> hospitalIds = new ArrayList<>();
             for (CasesEntryHospital casesEntryHospital : insertByHospitalVO.getCasesEntryHospitals()) {
                 if(!hospitalIds.contains(casesEntryHospital.getHospitalId())){
                     hospitalIds.add(casesEntryHospital.getHospitalId());

mrman-service/src/main/java/com/diagbot/facade/QcCacesEntryFacade.java

@@ -83,7 +83,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
         Map<Long,String> hospitalNameMap = qcHospitalInfoFacade.getHospitalInfoAll().stream().collect(Collectors.toMap(QcHospitalInfoAllDTO::getId,qcHospitalInfoAllDTO -> qcHospitalInfoAllDTO.getName()));
         for (CasesEntryHospital casesEntryHospital: casesEntryHospitals) {
             getUpdateInfoDetialDTO = new GetUpdateInfoDetialDTO();
-            getUpdateInfoDetialDTO.setHospitalName(hospitalNameMap.get(Long.parseLong(casesEntryHospital.getHospitalId())));
+            getUpdateInfoDetialDTO.setHospitalName(hospitalNameMap.get(casesEntryHospital.getHospitalId()));
             getUpdateInfoDetialDTO.setMsg(casesEntryHospital.getMsg());
             getUpdateInfoDetialDTO.setIsUsed(casesEntryHospital.getIsUsed());
             getUpdateInfoDetialDTO.setScore(casesEntryHospital.getScore());

mrman-service/src/main/java/com/diagbot/vo/UpdateByHospitalVO.java

@@ -14,6 +14,6 @@ import java.util.List;
 @Getter
 @Setter
 public class UpdateByHospitalVO {
-    private List<String> hospitalIds;
+    private List<Long> hospitalIds;
     private List<CasesEntryHospital> casesEntryHospitals;
 }