病例质控

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2020/3/23 18:30
+ */
+@Getter
+@Setter
+public class ModuleMappingDTO {
+    private Long modeId;
+    private String name;
+    private List<String> text;
+}

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

@@ -0,0 +1,31 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2020/3/23 17:56
+ */
+@Getter
+@Setter
+public class QcAllInputcasesDTO {
+    private Long id;
+    private String isDeleted;
+    private Date gmtCreate;
+    private Date gmtModified;
+    private String creator;
+    private String modifier;
+    private String hospitalId;
+    private String hospitalName;
+    private String caseNumber;
+    private String isTag;
+    private List<ModuleMappingDTO> moduleMappingDTOList;
+    private List<QcInputcasesMappingDTO> qcInputcasesMapping;
+    private String remark;
+
+}

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

@@ -3,8 +3,6 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-
 /**
  * @author wangfeng
  * @Description:
@@ -39,5 +37,7 @@ public class QcInputcasesMappingDTO {
      */
     private Integer pass;
 
+    private String caseNumberId;
+
 
 }

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

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_cases_number")
+public class CasesNumber implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院id
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String caseNumber;
+
+    private String isTag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getCaseNumber() {
+        return caseNumber;
+    }
+
+    public void setCaseNumber(String caseNumber) {
+        this.caseNumber = caseNumber;
+    }
+    public String getIsTag() {
+        return isTag;
+    }
+
+    public void setIsTag(String isTag) {
+        this.isTag = isTag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "CasesNumber{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", caseNumber=" + caseNumber +
+            ", isTag=" + isTag +
+            ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,133 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 病历
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_mode")
+public class Mode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Mode{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", name=" + name +
+            ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历内容
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_model_mapping")
+public class ModelMapping implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历号
+     */
+    private Long caseNumberId;
+
+    /**
+     * 数据类型id
+     */
+    private Long modeId;
+
+    /**
+     * 内容
+     */
+    private String text;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getCaseNumberId() {
+        return caseNumberId;
+    }
+
+    public void setCaseNumberId(Long caseNumberId) {
+        this.caseNumberId = caseNumberId;
+    }
+    public Long getModeId() {
+        return modeId;
+    }
+
+    public void setModeId(Long modeId) {
+        this.modeId = modeId;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ModelMapping{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", caseNumberId=" + caseNumberId +
+            ", modeId=" + modeId +
+            ", text=" + text +
+            ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -53,7 +52,7 @@ public class QcInputcasesMapping implements Serializable {
     /**
      * 病历文本id
      */
-    private Long textId;
+    private Long caseNumberId;
 
     /**
      * 病历id
@@ -114,13 +113,9 @@ public class QcInputcasesMapping implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
-    public Long getTextId() {
-        return textId;
-    }
 
-    public void setTextId(Long textId) {
-        this.textId = textId;
-    }
+
+
     public Long getCasesId() {
         return casesId;
     }
@@ -150,6 +145,14 @@ public class QcInputcasesMapping implements Serializable {
         this.remark = remark;
     }
 
+    public Long getCaseNumberId() {
+        return caseNumberId;
+    }
+
+    public void setCaseNumberId(Long caseNumberId) {
+        this.caseNumberId = caseNumberId;
+    }
+
     @Override
     public String toString() {
         return "QcInputcasesMapping{" +
@@ -159,7 +162,7 @@ public class QcInputcasesMapping implements Serializable {
             ", gmtModified=" + gmtModified +
             ", creator=" + creator +
             ", modifier=" + modifier +
-            ", textId=" + textId +
+            ", caseNumberId=" + caseNumberId +
             ", casesId=" + casesId +
             ", casesEntryId=" + casesEntryId +
             ", pass=" + pass +

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

@@ -2,16 +2,22 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.dto.QcCasesAllDTO;
+import com.diagbot.dto.ModuleMappingDTO;
+import com.diagbot.dto.QcAllInputcasesDTO;
 import com.diagbot.dto.QcInputcasesAllDTO;
 import com.diagbot.dto.QcInputcasesMappingDTO;
-import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.entity.CasesNumber;
+import com.diagbot.entity.Mode;
+import com.diagbot.entity.ModelMapping;
+import com.diagbot.entity.QcHospitalInfo;
 import com.diagbot.entity.QcInputcases;
 import com.diagbot.entity.QcInputcasesMapping;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.mapper.QcInputcasesMappingMapper;
+import com.diagbot.service.CasesNumberService;
+import com.diagbot.service.ModeService;
+import com.diagbot.service.ModelMappingService;
 import com.diagbot.service.QcInputcasesMappingService;
 import com.diagbot.service.QcInputcasesService;
 import com.diagbot.service.impl.QcInputcasesServiceImpl;
@@ -19,19 +25,20 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.QcInputMappingSaveVO;
+import com.diagbot.vo.QcInputcasesAllVO;
 import com.diagbot.vo.QcInputcasesByIdVO;
 import com.diagbot.vo.QcInputcasesSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import javax.swing.text.Utilities;
+import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -45,8 +52,16 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
     QcInputcasesService qcInputcasesService;
     @Autowired
     QcInputcasesMappingService qcInputcasesMappingService;
+    @Autowired
+    CasesNumberService casesNumberService;
+    @Autowired
+    ModelMappingService modelMappingService;
+    @Autowired
+    ModeService modeService;
+    @Autowired
+    QcHospitalInfoFacade qcHospitalInfoFacade;
 
-    public List<QcInputcasesAllDTO> getInputcasesAlls(Long textId) {
+   /* public List<QcInputcasesAllDTO> getInputcasesAlls(Long textId) {
         //查出所有病例
         QueryWrapper<QcInputcases> qcInputcasesQuery = new QueryWrapper<>();
         qcInputcasesQuery
@@ -73,7 +88,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
             }
         }
         return dataNew;
-    }
+    }*/
 
     /**
      * @param qcInputcasesSaveVO
@@ -129,7 +144,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                 qcList.setCreator(qcInputcasesSaveVO.getCreator());
                 qcList.setCasesId(t.getCasesId());
                 qcList.setPass(t.getPass());
-                qcList.setTextId(qcInputcasesSaveVO.getId());
+               /* qcList.setTextId(qcInputcasesSaveVO.getId());*/
                 qcList.setGmtModified(DateUtil.now());
                 qcMappingList.add(qcList);
             }
@@ -174,7 +189,7 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                     qcList.setCreator(qcInputcasesSaveVO.getCreator());
                     qcList.setCasesId(t.getCasesId());
                     qcList.setPass(t.getPass());
-                    qcList.setTextId(qcInputcases.getId());
+                   /* qcList.setTextId(qcInputcases.getId());*/
                     qcMappingList.add(qcList);
                 }
                 res = qcInputcasesMappingService.saveBatch(qcMappingList);
@@ -209,4 +224,224 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
         }
         return res;
     }
+
+    public List<QcAllInputcasesDTO> getAllInputcases(QcInputcasesAllVO qcInputcasesAllVO){
+        List<Long> hospitalIds = new ArrayList<>();
+        if (StringUtil.isNotEmpty(qcInputcasesAllVO.getHospitalName())){
+            QueryWrapper<QcHospitalInfo> qcHospitalInfoQueryWrapper = new QueryWrapper<>();
+            qcHospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                    .like("name",qcInputcasesAllVO.getHospitalName());
+            hospitalIds = qcHospitalInfoFacade.list().stream().map(QcHospitalInfo::getId).collect(Collectors.toList());
+        }
+        //病例
+        QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
+        casesNumberQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_modified");
+        if(StringUtil.isNotEmpty(qcInputcasesAllVO.getCaseNumber())){
+            casesNumberQueryWrapper.like("case_number",qcInputcasesAllVO.getCaseNumber());
+        }
+        if(StringUtil.isNotEmpty(qcInputcasesAllVO.getHospitalName())){
+            casesNumberQueryWrapper.in("hospital_id",hospitalIds);
+        }
+        List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
+        List<QcAllInputcasesDTO> res = new ArrayList<>();
+        //病例内容
+        QueryWrapper<ModelMapping> modelMappingQueryWrapper = new QueryWrapper<>();
+        modelMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<ModelMapping> modelMappings = modelMappingService.list();
+        Map<Long, List<ModelMapping>> modelMap
+                = EntityUtil.makeEntityListMap(modelMappings, "modeId");
+        //病例列表
+        QueryWrapper<Mode> modelQueryWrapper = new QueryWrapper<>();
+        modelQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<Mode> modes = modeService.list();
+        Map<Long,String> modeMap = new HashMap<>();
+        modeMap = modes.stream().collect(Collectors.toMap(Mode::getId,mode -> mode.getName()));
+        //病例列表
+        QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
+        hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
+        Map<Long,String> hospitalMap = new HashMap<>();
+        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
+        //将病例内容放入出参
+        res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
+        List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
+        List<Long> modIds = new ArrayList<>();
+        ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
+        List modeList = new ArrayList();
+        for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
+            moduleMappingDTOS = new ArrayList<>();
+            for (Mode mode : modes) {
+                moduleMappingDTO = new ModuleMappingDTO();
+                moduleMappingDTO.setModeId(mode.getId());
+                moduleMappingDTO.setName(mode.getName());
+                if(modelMap.get(mode.getId()) != null){
+                    modeList = new ArrayList();
+                    modeList = modelMap.get(mode.getId()).stream().map(ModelMapping::getText).collect(Collectors.toList());
+                    moduleMappingDTO.setText(modeList);
+                }
+                moduleMappingDTOS.add(moduleMappingDTO);
+            }
+            qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
+            qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
+        }
+       /* for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
+            for (ModelMapping modelMapping : modelMappings) {
+                if (qcAllInputcasesDTO.getId().intValue() == modelMapping.getCaseNumberId().intValue()){
+                        if(!modIds.contains(modelMapping.getModeId())){
+                            moduleMappingDTO = new ModuleMappingDTO();
+                            moduleMappingDTO.setModeId(modelMapping.getModeId());
+                            moduleMappingDTO.setName(modeMap.get(modelMapping.getModeId()));
+                            moduleMappingDTO.setText(modelMapping.getText());
+                            moduleMappingDTOS.add(moduleMappingDTO);
+                            modIds.add(modelMapping.getModeId());
+                        }
+                }
+            }
+            qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
+            qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
+        }*/
+
+        // 查出所有病例病例类型
+        List<QcInputcasesMappingDTO> qcInputcasesMapping = qcInputcasesMappingService.getInputMapping(qcInputcasesAllVO.getCaseNumber());
+        // 然后把所有病例类型放进去
+        Map<Long, List<QcInputcasesMappingDTO>> map
+                = EntityUtil.makeEntityListMap(qcInputcasesMapping, "caseNumberId");
+        if (res.size() > 0) {
+            for (QcAllInputcasesDTO ts : res) {
+                List<QcInputcasesMappingDTO> tmp = map.get(ts.getId().toString());
+                if (ListUtil.isNotEmpty(tmp)) {
+                    ts.setQcInputcasesMapping(tmp);
+                }
+            }
+        }
+
+        return  res;
+    }
+
+    /**
+     * @param qcInputcasesByIdVO
+     * @return
+     */
+    public boolean deleteById(QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = false;
+        UpdateWrapper<QcInputcases> qcInputcasesQuery = new UpdateWrapper<>();
+        qcInputcasesQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", qcInputcasesByIdVO.getCaseNumberId())
+                .set("modifier", qcInputcasesByIdVO.getCreator())
+                .set("is_deleted", IsDeleteEnum.Y.getKey());
+        res = update(qcInputcasesQuery);
+        if (res) {
+            UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesByIdVO.getCaseNumberId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = qcInputcasesMappingService.update(qcMappingQuery);
+        }
+        if (res) {
+            UpdateWrapper<ModelMapping> modelMappingUpdateWrapper = new UpdateWrapper<>();
+            modelMappingUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesByIdVO.getCaseNumberId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = modelMappingService.update(modelMappingUpdateWrapper);
+        }
+        return res;
+    }
+
+    /**
+     * @param qcInputcasesSaveVO
+     * @return
+     */
+    public boolean saveOrUpdata(QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = false;
+        if (qcInputcasesSaveVO.getCaseNumberId() != null && qcInputcasesSaveVO.getCaseNumberId() != 0) {
+            //校验数据是否存在
+            QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
+            Map<String, Object> mapAll = new HashMap<>();
+            mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+            mapAll.put("id", qcInputcasesSaveVO.getCaseNumberId());
+            casesNumberQueryWrapper.allEq(mapAll);
+            int sum = casesNumberService.count(casesNumberQueryWrapper);
+            if (sum == 0) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例不存在");
+            }
+            UpdateWrapper<CasesNumber> casesNumberUpdateWrapper = new UpdateWrapper<>();
+            casesNumberUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id", qcInputcasesSaveVO.getCaseNumberId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
+                    .set("hospital_id", qcInputcasesSaveVO.getHospitalId())
+                    .set("case_number", qcInputcasesSaveVO.getCaseNumber())
+                    .set("is_tag", qcInputcasesSaveVO.getIsTag());
+            res = casesNumberService.update(casesNumberUpdateWrapper);
+           /* UpdateWrapper<ModelMapping> modelMappingUpdateWrapper = new UpdateWrapper<>();
+            modelMappingUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesSaveVO.getId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
+                    .set("mode_id", qcInputcasesSaveVO.getModeId())
+                    .set("text", qcInputcasesSaveVO.getText());
+            res = modelMappingService.update(modelMappingUpdateWrapper);*/
+            QueryWrapper<QcInputcasesMapping> qcMappingQuery = new QueryWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesSaveVO.getCaseNumberId());
+            res = qcInputcasesMappingService.remove(qcMappingQuery);
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+
+            List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+            for (QcInputMappingSaveVO t : inputMapping) {
+                QcInputcasesMapping qcList = new QcInputcasesMapping();
+                qcList.setCasesEntryId(t.getCasesEntryId());
+                qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                qcList.setCasesId(t.getCasesId());
+                qcList.setPass(t.getPass());
+                qcList.setCaseNumberId(qcInputcasesSaveVO.getCaseNumberId());
+                qcList.setGmtModified(DateUtil.now());
+                qcMappingList.add(qcList);
+            }
+            res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+        } else {
+            CasesNumber casesNumber = new CasesNumber();
+            casesNumber.setGmtModified(DateUtil.now());
+            casesNumber.setCreator(qcInputcasesSaveVO.getCreator());
+            casesNumber.setCaseNumber(qcInputcasesSaveVO.getCaseNumber());
+            casesNumber.setHospitalId(qcInputcasesSaveVO.getHospitalId().toString());
+            casesNumber.setIsTag(qcInputcasesSaveVO.getIsTag());
+            casesNumber.setId(qcInputcasesSaveVO.getCaseNumberId());
+            res = casesNumberService.save(casesNumber);
+           /* ModelMapping modelMapping = new ModelMapping();
+            modelMapping.setCaseNumberId(qcInputcasesSaveVO.getCaseNumberId());
+            modelMapping.setCreator(qcInputcasesSaveVO.getCreator());
+            modelMapping.setGmtCreate(DateUtil.now());
+            modelMapping.setModeId(qcInputcasesSaveVO.getModeId());
+            modelMapping.setText(qcInputcasesSaveVO.getText());
+            res = modelMappingService.save(modelMapping);*/
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+            if (res) {
+                List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+                for (QcInputMappingSaveVO t : inputMapping) {
+                    QcInputcasesMapping qcList = new QcInputcasesMapping();
+                    qcList.setCasesEntryId(t.getCasesEntryId());
+                    qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                    qcList.setCasesId(t.getCasesId());
+                    qcList.setPass(t.getPass());
+                    qcList.setCaseNumberId(casesNumber.getId());
+                    qcMappingList.add(qcList);
+                }
+                res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+            }
+        }
+
+        return res;
+    }
 }

mrman-service/src/main/java/com/diagbot/mapper/CasesNumberMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.CasesNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface CasesNumberMapper extends BaseMapper<CasesNumber> {
+
+}

mrman-service/src/main/java/com/diagbot/mapper/ModeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.Mode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModeMapper extends BaseMapper<Mode> {
+
+}

mrman-service/src/main/java/com/diagbot/mapper/ModelMappingMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ModelMapping;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历内容 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModelMappingMapper extends BaseMapper<ModelMapping> {
+
+}

mrman-service/src/main/java/com/diagbot/mapper/QcInputcasesMappingMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface QcInputcasesMappingMapper extends BaseMapper<QcInputcasesMapping> {
 
     public List<QcInputcasesMappingDTO> getQcInputMapping(Long textId);
+
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId);
 }

mrman-service/src/main/java/com/diagbot/service/CasesNumberService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.CasesNumber;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface CasesNumberService extends IService<CasesNumber> {
+
+}

mrman-service/src/main/java/com/diagbot/service/ModeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.Mode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModeService extends IService<Mode> {
+
+}

mrman-service/src/main/java/com/diagbot/service/ModelMappingService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ModelMapping;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历内容 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModelMappingService extends IService<ModelMapping> {
+
+}

mrman-service/src/main/java/com/diagbot/service/QcInputcasesMappingService.java

@@ -1,6 +1,5 @@
 package com.diagbot.service;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.QcInputcasesMappingDTO;
 import com.diagbot.entity.QcInputcasesMapping;
@@ -19,4 +18,6 @@ import java.util.List;
 public interface QcInputcasesMappingService extends IService<QcInputcasesMapping> {
 
     public List<QcInputcasesMappingDTO> getQcInputMappings(Long textId);
+
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId);
 }

mrman-service/src/main/java/com/diagbot/service/impl/CasesNumberServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.CasesNumber;
+import com.diagbot.mapper.CasesNumberMapper;
+import com.diagbot.service.CasesNumberService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class CasesNumberServiceImpl extends ServiceImpl<CasesNumberMapper, CasesNumber> implements CasesNumberService {
+
+}

mrman-service/src/main/java/com/diagbot/service/impl/ModeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.Mode;
+import com.diagbot.mapper.ModeMapper;
+import com.diagbot.service.ModeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class ModeServiceImpl extends ServiceImpl<ModeMapper, Mode> implements ModeService {
+
+}

mrman-service/src/main/java/com/diagbot/service/impl/ModelMappingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ModelMapping;
+import com.diagbot.mapper.ModelMappingMapper;
+import com.diagbot.service.ModelMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历内容 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class ModelMappingServiceImpl extends ServiceImpl<ModelMappingMapper, ModelMapping> implements ModelMappingService {
+
+}

mrman-service/src/main/java/com/diagbot/service/impl/QcInputcasesMappingServiceImpl.java

@@ -20,6 +20,11 @@ import java.util.List;
 @Service
 public class QcInputcasesMappingServiceImpl extends ServiceImpl<QcInputcasesMappingMapper, QcInputcasesMapping> implements QcInputcasesMappingService {
 
+    @Override
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId) {
+        return baseMapper.getInputMapping(caseNumberId);
+    }
+
     public List<QcInputcasesMappingDTO> getQcInputMappings(Long textId){
         return  baseMapper.getQcInputMapping(textId);
     }

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

@@ -12,4 +12,8 @@ import lombok.Setter;
 @Getter
 public class QcInputcasesAllVO {
     private  Long textId;
+
+    private String caseNumber;
+
+    private String hospitalName;
 }

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

@@ -13,4 +13,5 @@ import lombok.Setter;
 public class QcInputcasesByIdVO {
     private  String creator;
     private  Long textId;
+    private  Long caseNumberId;
 }

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

@@ -92,4 +92,11 @@ public class QcInputcasesSaveVO {
 
     private List<QcInputMappingSaveVO> qcInputMappingSaveVO;
 
+    private Long caseNumberId;
+
+    private String caseNumber;
+
+    private Long modeId;
+
+    private String isTag;
 }

mrman-service/src/main/java/com/diagbot/web/QcInputcasesController.java

@@ -2,13 +2,12 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.QcInputcasesAllDTO;
+import com.diagbot.dto.QcAllInputcasesDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QcInputcasesFacade;
 import com.diagbot.vo.QcInputcasesAllVO;
 import com.diagbot.vo.QcInputcasesByIdVO;
 import com.diagbot.vo.QcInputcasesSaveVO;
-import com.diagbot.vo.QcInputcasesVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,14 +34,15 @@ public class QcInputcasesController{
 
     @Autowired
     QcInputcasesFacade qcInputcasesFacade;
-    @ApiOperation(value = "获取全部病历录入[by:wangfeng]",
+
+    /*@ApiOperation(value = "获取全部病历录入[by:wangfeng]",
             notes = "获取全部病历录入")
     @PostMapping("/getInputcasesAll")
     @SysLogger("getInputcasesAll")
     public RespDTO<List<QcInputcasesAllDTO>> getInputcasesAll(@Valid @RequestBody QcInputcasesAllVO qcInputcasesAllVO) {
         List<QcInputcasesAllDTO> data = qcInputcasesFacade.getInputcasesAlls(qcInputcasesAllVO.getTextId());
         return RespDTO.onSuc(data);
-    }
+    }*/
     @ApiOperation(value = "保存和修改全部病历录入[by:wangfeng]",
             notes = "id; 病历id（保存不传，修改必传）医院Id：hospitalId;" +
                     "入院记录： text;" +
@@ -76,4 +76,47 @@ public class QcInputcasesController{
         boolean res = qcInputcasesFacade.cancelByIds(qcInputcasesByIdVO);
         return RespDTO.onSuc(res);
     }
+
+    @ApiOperation(value = "删除病历录入[by:wangyu]",
+            notes = "删除病历录入病历录入")
+    @PostMapping("/deleteById")
+    @SysLogger("deleteById")
+    public RespDTO<Boolean> deleteById(@Valid @RequestBody QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = qcInputcasesFacade.deleteById(qcInputcasesByIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "获取全部病历录入[by:wangyu]",
+            notes = "获取全部病历录入")
+    @PostMapping("/getAllInputcases")
+    @SysLogger("getAllInputcases")
+    public RespDTO<List<QcAllInputcasesDTO>> getAllInputcases(@Valid @RequestBody QcInputcasesAllVO qcInputcasesAllVO) {
+        List<QcAllInputcasesDTO> data = qcInputcasesFacade.getAllInputcases(qcInputcasesAllVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "保存和修改全部病历录入[by:wangfeng]",
+            notes = "id; 病历id（保存不传，修改必传）医院Id：hospitalId;" +
+                    "入院记录： text;" +
+                    " 临床用血审核： clinicalBlood;" +
+                    "会诊： consultation;" +
+                    "死亡病例讨论： deathCaseDiscuss;" +
+                    "死亡记录：deathRecord;" +
+                    "疑难病例讨论：difficultCaseDiscuss;" +
+                    "值班交接班：dutyShiftSystem;" +
+                    "首次病程录： firstCourseRecord;" +
+                    "出院小结： leaveHospital;" +
+                    "分级护理：nursingSystem; " +
+                    "手术期间讨论： operationDiscussion;" +
+                    "术前讨论： preOperativeDiscussion;" +
+                    "三级查房：threeLevelWard; " +
+                    "危急值报告：criticalValue;" +
+                    "qcInputMappingSaveVO{textId: 病历文本id ;casesId: 模块id;casesEntryId: 条目id ;pass:是否通过"+
+                    "}")
+    @PostMapping("/saveOrUpdata")
+    @SysLogger("saveOrUpdata")
+    public RespDTO<Boolean> saveOrUpdata(@Valid @RequestBody QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = qcInputcasesFacade.saveOrUpdata(qcInputcasesSaveVO);
+        return RespDTO.onSuc(res);
+    }
 }

mrman-service/src/main/resources/mapper/CasesNumberMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.CasesNumberMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.CasesNumber">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="case_number" property="caseNumber" />
+        <result column="is_tag" property="isTag" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

mrman-service/src/main/resources/mapper/ModeMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ModeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Mode">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

mrman-service/src/main/resources/mapper/ModelMappingMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ModelMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModelMapping">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="case_number_id" property="caseNumberId" />
+        <result column="mode_id" property="modeId" />
+        <result column="text" property="text" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

mrman-service/src/main/resources/mapper/QcInputcasesMappingMapper.xml

@@ -38,4 +38,27 @@
         </if>
 
     </select>
+
+    <select id="getInputMapping" parameterType="Long" resultType="com.diagbot.dto.QcInputcasesMappingDTO">
+
+        SELECT
+        a.id AS Id,
+        a.case_number_id AS caseNumberId,
+        a.cases_id AS casesId,
+        c.name AS casesName,
+        a.cases_entry_id AS casesEntryId,
+        b.name AS EntryName,
+        a.pass AS pass
+        FROM qc_inputcases_mapping a
+        JOIN qc_cases_entry b ON a.cases_entry_id = b.id
+        JOIN qc_cases c ON a.cases_id = c.id
+        JOIN qc_cases_number d ON a.case_number_id = d.id
+        WHERE a.is_deleted ="N"
+        AND b.is_deleted ="N"
+        AND c.is_deleted ="N"
+        <if test="caseNumberId != null ">
+            AND d.case_number LIKE CONCAT('%', #{caseNumberId},'%')
+        </if>
+
+    </select>
 </mapper>

mrman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -34,7 +34,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
+        gc.setAuthor("wangyu");// 作者
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");