瀏覽代碼

优化病例入录5.0

wangfeng 5 年之前
父節點
當前提交
60b7f72fa6

+ 4 - 4
icss-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -33,7 +33,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
+        gc.setAuthor("wangfeng");// 作者
 
         // 自定义文件命名,注意 %s 会自动填充表实体属性!
         gc.setControllerName("%sController");
@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "icss_template_folder","icss_folder_mapping","icss_template_classify","icss_classify_mapping" }); // 需要生成的表
+        strategy.setInclude(new String[] {"qc_hospital_info","qc_inputcases"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

+ 3 - 5
mrman-service/src/main/java/com/diagbot/dto/QcCasesDTO.java

@@ -10,10 +10,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QcCasesDTO {
+public class QcCasesDTO  {
     private Long Id ;
-    private String casesName;
-    private Long entryId;
-    private String entryName;
-    private Long casesId;
+    private String name;
+    private String remark;
 }

+ 25 - 0
mrman-service/src/main/java/com/diagbot/dto/QcHospitalInfoAllDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diagbot.entity.QcHospitalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-17 13:49
+ */
+@Setter
+@Getter
+public class QcHospitalInfoAllDTO  {
+    private Long id;
+    /**
+     * 医院名称
+     */
+    private String name;
+
+}

+ 212 - 0
mrman-service/src/main/java/com/diagbot/entity/QcHospitalInfo.java

@@ -0,0 +1,212 @@
+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;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医院信息表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@TableName("qc_hospital_info")
+public class QcHospitalInfo 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 String code;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 状态:0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 是否对接(0-不对接,1-对接)
+     */
+    private Integer connect;
+
+    /**
+     * 备注
+     */
+    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 getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public Integer getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Integer connect) {
+        this.connect = connect;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcHospitalInfo{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", code=" + code +
+            ", name=" + name +
+            ", address=" + address +
+            ", spell=" + spell +
+            ", status=" + status +
+            ", orderNo=" + orderNo +
+            ", connect=" + connect +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 184 - 3
mrman-service/src/main/java/com/diagbot/entity/QcInputcases.java

@@ -1,8 +1,9 @@
 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;
 import java.util.Date;
 
@@ -12,8 +13,9 @@ import java.util.Date;
  * </p>
  *
  * @author wangfeng
- * @since 2020-03-10
+ * @since 2020-03-17
  */
+@TableName("qc_inputcases")
 public class QcInputcases implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -49,11 +51,78 @@ public class QcInputcases implements Serializable {
      */
     private String modifier;
 
+    private Integer hospitalId;
+
     /**
-     * 病历文本
+     * 入院记录
      */
     private String text;
 
+    /**
+     * 临床用血审核
+     */
+    private String clinicalBlood;
+
+    /**
+     * 会诊
+     */
+    private String consultation;
+
+    /**
+     * 死亡病例讨论
+     */
+    private String deathCaseDiscuss;
+
+    /**
+     * 死亡记录
+     */
+    private String deathRecord;
+
+    /**
+     * 疑难病例讨论
+     */
+    private String difficultCaseDiscuss;
+
+    /**
+     * 值班交接班
+     */
+    private String dutyShiftSystem;
+
+    /**
+     * 首次病程录
+     */
+    private String firstCourseRecord;
+
+    /**
+     * 出院小结
+     */
+    private String leaveHospital;
+
+    /**
+     * 分级护理
+     */
+    private String nursingSystem;
+
+    /**
+     * 手术期间讨论
+     */
+    private String operationDiscussion;
+
+    /**
+     * 术前讨论
+     */
+    private String preOperativeDiscussion;
+
+    /**
+     * 三级查房
+     */
+    private String threeLevelWard;
+
+    /**
+     * 危急值报告
+     */
+    private String criticalValue;
+
     /**
      * 备注
      */
@@ -101,6 +170,13 @@ public class QcInputcases implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
     public String getText() {
         return text;
     }
@@ -108,6 +184,97 @@ public class QcInputcases implements Serializable {
     public void setText(String text) {
         this.text = text;
     }
+    public String getClinicalBlood() {
+        return clinicalBlood;
+    }
+
+    public void setClinicalBlood(String clinicalBlood) {
+        this.clinicalBlood = clinicalBlood;
+    }
+    public String getConsultation() {
+        return consultation;
+    }
+
+    public void setConsultation(String consultation) {
+        this.consultation = consultation;
+    }
+    public String getDeathCaseDiscuss() {
+        return deathCaseDiscuss;
+    }
+
+    public void setDeathCaseDiscuss(String deathCaseDiscuss) {
+        this.deathCaseDiscuss = deathCaseDiscuss;
+    }
+    public String getDeathRecord() {
+        return deathRecord;
+    }
+
+    public void setDeathRecord(String deathRecord) {
+        this.deathRecord = deathRecord;
+    }
+    public String getDifficultCaseDiscuss() {
+        return difficultCaseDiscuss;
+    }
+
+    public void setDifficultCaseDiscuss(String difficultCaseDiscuss) {
+        this.difficultCaseDiscuss = difficultCaseDiscuss;
+    }
+    public String getDutyShiftSystem() {
+        return dutyShiftSystem;
+    }
+
+    public void setDutyShiftSystem(String dutyShiftSystem) {
+        this.dutyShiftSystem = dutyShiftSystem;
+    }
+    public String getFirstCourseRecord() {
+        return firstCourseRecord;
+    }
+
+    public void setFirstCourseRecord(String firstCourseRecord) {
+        this.firstCourseRecord = firstCourseRecord;
+    }
+    public String getLeaveHospital() {
+        return leaveHospital;
+    }
+
+    public void setLeaveHospital(String leaveHospital) {
+        this.leaveHospital = leaveHospital;
+    }
+    public String getNursingSystem() {
+        return nursingSystem;
+    }
+
+    public void setNursingSystem(String nursingSystem) {
+        this.nursingSystem = nursingSystem;
+    }
+    public String getOperationDiscussion() {
+        return operationDiscussion;
+    }
+
+    public void setOperationDiscussion(String operationDiscussion) {
+        this.operationDiscussion = operationDiscussion;
+    }
+    public String getPreOperativeDiscussion() {
+        return preOperativeDiscussion;
+    }
+
+    public void setPreOperativeDiscussion(String preOperativeDiscussion) {
+        this.preOperativeDiscussion = preOperativeDiscussion;
+    }
+    public String getThreeLevelWard() {
+        return threeLevelWard;
+    }
+
+    public void setThreeLevelWard(String threeLevelWard) {
+        this.threeLevelWard = threeLevelWard;
+    }
+    public String getCriticalValue() {
+        return criticalValue;
+    }
+
+    public void setCriticalValue(String criticalValue) {
+        this.criticalValue = criticalValue;
+    }
     public String getRemark() {
         return remark;
     }
@@ -125,7 +292,21 @@ public class QcInputcases implements Serializable {
             ", gmtModified=" + gmtModified +
             ", creator=" + creator +
             ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
             ", text=" + text +
+            ", clinicalBlood=" + clinicalBlood +
+            ", consultation=" + consultation +
+            ", deathCaseDiscuss=" + deathCaseDiscuss +
+            ", deathRecord=" + deathRecord +
+            ", difficultCaseDiscuss=" + difficultCaseDiscuss +
+            ", dutyShiftSystem=" + dutyShiftSystem +
+            ", firstCourseRecord=" + firstCourseRecord +
+            ", leaveHospital=" + leaveHospital +
+            ", nursingSystem=" + nursingSystem +
+            ", operationDiscussion=" + operationDiscussion +
+            ", preOperativeDiscussion=" + preOperativeDiscussion +
+            ", threeLevelWard=" + threeLevelWard +
+            ", criticalValue=" + criticalValue +
             ", remark=" + remark +
         "}";
     }

+ 6 - 3
mrman-service/src/main/java/com/diagbot/facade/QcCasesFacade.java

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QcCasesAllDTO;
 import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.dto.QcHospitalInfoAllDTO;
 import com.diagbot.entity.QcCases;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.enums.IsDeleteEnum;
@@ -62,8 +63,10 @@ public class QcCasesFacade extends QcCasesServiceImpl {
         return dataNew;
     }
 
-    public List<QcCasesDTO> getCasesAll(Long casesId) {
-         List<QcCasesDTO> data=  qcCasesService.getCasesLists(casesId);
-        return data;
+    public List<QcCasesDTO> getCasesAll() {
+        List<QcCases> data = qcCasesService.list();
+        List<QcCasesDTO> dataNew = new ArrayList<QcCasesDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcCasesDTO.class);
+        return dataNew;
     }
 }

+ 35 - 0
mrman-service/src/main/java/com/diagbot/facade/QcHospitalInfoFacade.java

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.QcHospitalInfoAllDTO;
+import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.service.QcHospitalInfoService;
+import com.diagbot.service.impl.QcHospitalInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-17 13:47
+ */
+@Component
+public class QcHospitalInfoFacade extends QcHospitalInfoServiceImpl {
+
+    @Autowired
+    QcHospitalInfoService qcHospitalInfoService;
+
+    /**
+     *
+     * @return
+     */
+    public List<QcHospitalInfoAllDTO> getHospitalInfoAll() {
+        List<QcHospitalInfo> data = qcHospitalInfoService.list();
+        List<QcHospitalInfoAllDTO> dataNew = new ArrayList<QcHospitalInfoAllDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcHospitalInfoAllDTO.class);
+        return dataNew;
+    }
+}

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

@@ -97,7 +97,20 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                     .eq("id", qcInputcasesSaveVO.getId())
                     .set("gmt_modified", DateUtil.now())
                     .set("creator", qcInputcasesSaveVO.getCreator())
-                    .set("text", qcInputcasesSaveVO.getText());
+                    .set("text", qcInputcasesSaveVO.getText())
+                    .set("clinical_blood", qcInputcasesSaveVO.getClinicalBlood())
+                    .set("consultation", qcInputcasesSaveVO.getConsultation())
+                    .set("death_case_discuss", qcInputcasesSaveVO.getDeathCaseDiscuss())
+                    .set("death_record", qcInputcasesSaveVO.getDeathRecord())
+                    .set("difficult_case_discuss", qcInputcasesSaveVO.getDifficultCaseDiscuss())
+                    .set("duty_shift_system", qcInputcasesSaveVO.getDutyShiftSystem())
+                    .set("first_course_record", qcInputcasesSaveVO.getFirstCourseRecord())
+                    .set("leave_hospital", qcInputcasesSaveVO.getLeaveHospital())
+                    .set("nursing_system", qcInputcasesSaveVO.getNursingSystem())
+                    .set("operation_discussion", qcInputcasesSaveVO.getOperationDiscussion())
+                    .set("pre_operative_discussion", qcInputcasesSaveVO.getPreOperativeDiscussion())
+                    .set("three_level_ward", qcInputcasesSaveVO.getThreeLevelWard())
+                    .set("critical_value", qcInputcasesSaveVO.getCriticalValue());
             res = update(qcInputcasesQuery);
             UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
             qcMappingQuery
@@ -132,9 +145,23 @@ public class QcInputcasesFacade extends QcInputcasesServiceImpl {
                 throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例存在");
             }
             QcInputcases qcInputcases = new QcInputcases();
-            qcInputcases.setText(qcInputcasesSaveVO.getText());
+           /* qcInputcases.setText(qcInputcasesSaveVO.getText());
+            qcInputcases.setClinicalBlood(qcInputcasesSaveVO.getClinicalBlood());
+            qcInputcases.setConsultation(qcInputcasesSaveVO.getConsultation());
+            qcInputcases.setCriticalValue(qcInputcasesSaveVO.getCriticalValue());
+            qcInputcases.setDeathCaseDiscuss(qcInputcasesSaveVO.getDeathCaseDiscuss());
+            qcInputcases.setDeathRecord(qcInputcasesSaveVO.getDeathRecord());
+            qcInputcases.setDifficultCaseDiscuss(qcInputcasesSaveVO.getDifficultCaseDiscuss());
+            qcInputcases.setDutyShiftSystem(qcInputcasesSaveVO.getDutyShiftSystem());
+            qcInputcases.setFirstCourseRecord(qcInputcasesSaveVO.getFirstCourseRecord());
+            qcInputcases.setLeaveHospital(qcInputcasesSaveVO.getLeaveHospital());
+            qcInputcases.setNursingSystem(qcInputcasesSaveVO.getNursingSystem());
+            qcInputcases.setOperationDiscussion(qcInputcasesSaveVO.getOperationDiscussion());
+            qcInputcases.setPreOperativeDiscussion(qcInputcasesSaveVO.getPreOperativeDiscussion());
+            qcInputcases.setThreeLevelWard(qcInputcasesSaveVO.getThreeLevelWard());
             qcInputcases.setCreator(qcInputcasesSaveVO.getCreator());
-            qcInputcases.setGmtModified(DateUtil.now());
+            qcInputcases.setGmtModified(DateUtil.now());*/
+            BeanUtil.copyProperties(qcInputcasesSaveVO,qcInputcases);
             res = save(qcInputcases);
             List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
             if (res) {

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcHospitalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 医院信息表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+public interface QcHospitalInfoMapper extends BaseMapper<QcHospitalInfo> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/service/QcHospitalInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 医院信息表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+public interface QcHospitalInfoService extends IService<QcHospitalInfo> {
+
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcHospitalInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.mapper.QcHospitalInfoMapper;
+import com.diagbot.service.QcHospitalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 医院信息表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@Service
+public class QcHospitalInfoServiceImpl extends ServiceImpl<QcHospitalInfoMapper, QcHospitalInfo> implements QcHospitalInfoService {
+
+}

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

@@ -18,12 +18,77 @@ public class QcInputcasesSaveVO {
      * 病例id
      */
     private Long id;
+    private Integer hospitalId;
     /**
      * 病历文本
      */
     private String text;
 
-    private String creator;;
+    private String creator;
+    /**
+     * 临床用血审核
+     */
+    private String clinicalBlood;
+
+    /**
+     * 会诊
+     */
+    private String consultation;
+
+    /**
+     * 死亡病例讨论
+     */
+    private String deathCaseDiscuss;
+
+    /**
+     * 死亡记录
+     */
+    private String deathRecord;
+
+    /**
+     * 疑难病例讨论
+     */
+    private String difficultCaseDiscuss;
+
+    /**
+     * 值班交接班
+     */
+    private String dutyShiftSystem;
+
+    /**
+     * 首次病程录
+     */
+    private String firstCourseRecord;
+
+    /**
+     * 出院小结
+     */
+    private String leaveHospital;
+
+    /**
+     * 分级护理
+     */
+    private String nursingSystem;
+
+    /**
+     * 手术期间讨论
+     */
+    private String operationDiscussion;
+
+    /**
+     * 术前讨论
+     */
+    private String preOperativeDiscussion;
+
+    /**
+     * 三级查房
+     */
+    private String threeLevelWard;
+
+    /**
+     * 危急值报告
+     */
+    private String criticalValue;
 
     private List<QcInputMappingSaveVO> qcInputMappingSaveVO;
 

+ 8 - 8
mrman-service/src/main/java/com/diagbot/web/QcCasesController.java

@@ -42,12 +42,12 @@ public class QcCasesController {
         return RespDTO.onSuc(data);
     }
 
-    /*@ApiOperation(value = "获取全部病历条目详情[by:wangfeng]",
-            notes = "获取全部病历条目详情")
-    @PostMapping("/getCasesAlls")
-    @SysLogger("getCasesAlls")
-    public RespDTO<List<QcCasesDTO>> getCasesAlls(@Valid @RequestBody Long casesId) {
-
-        return RespDTO.onSuc(qcCasesFacade.getCasesAll(casesId));
-    }*/
+    @ApiOperation(value = "获取全部模块[by:wangfeng]",
+            notes = "获取全部模块")
+    @PostMapping("/getCases")
+    @SysLogger("getCases")
+    public RespDTO<List<QcCasesDTO>> getCasesAlls() {
+
+        return RespDTO.onSuc(qcCasesFacade.getCasesAll());
+    }
 }

+ 45 - 0
mrman-service/src/main/java/com/diagbot/web/QcHospitalInfoController.java

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.QcHospitalInfoAllDTO;
+import com.diagbot.dto.QcInputcasesAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.QcHospitalInfoFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+
+@RestController
+@RequestMapping("/qcHospitalInfo")
+@Api(value = "医院信息相关接口", tags = { "医院信息相关接口" })
+public class QcHospitalInfoController {
+
+    @Autowired
+    QcHospitalInfoFacade qcHospitalInfoFacade;
+
+    @ApiOperation(value = "获取全部病历录入[by:wangfeng]",
+            notes = "获取全部病历录入")
+    @PostMapping("/getHospitalInfoAll")
+    @SysLogger("getHospitalInfoAll")
+    public RespDTO<List<QcHospitalInfoAllDTO>> getHospitalInfoAll() {
+        List<QcHospitalInfoAllDTO> data = qcHospitalInfoFacade.getHospitalInfoAll();
+        return RespDTO.onSuc(data);
+    }
+}

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

@@ -44,7 +44,22 @@ public class QcInputcasesController{
         return RespDTO.onSuc(data);
     }
     @ApiOperation(value = "保存和修改全部病历录入[by:wangfeng]",
-            notes = "id; 病历id(保存不传,修改必传)text;病历文本qcInputMappingSaveVO{textId: 病历文本id ;casesId: 模块id;casesEntryId: 条目id ;pass:是否通过"+
+            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("/getInputcasesAlls")
     @SysLogger("getInputcasesAlls")

+ 23 - 0
mrman-service/src/main/resources/mapper/QcHospitalInfoMapper.xml

@@ -0,0 +1,23 @@
+<?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.QcHospitalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcHospitalInfo">
+        <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="code" property="code" />
+        <result column="name" property="name" />
+        <result column="address" property="address" />
+        <result column="spell" property="spell" />
+        <result column="status" property="status" />
+        <result column="order_no" property="orderNo" />
+        <result column="connect" property="connect" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 14 - 0
mrman-service/src/main/resources/mapper/QcInputcasesMapper.xml

@@ -10,7 +10,21 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
+        <result column="hospital_id" property="hospitalId" />
         <result column="text" property="text" />
+        <result column="clinical_blood" property="clinicalBlood" />
+        <result column="consultation" property="consultation" />
+        <result column="death_case_discuss" property="deathCaseDiscuss" />
+        <result column="death_record" property="deathRecord" />
+        <result column="difficult_case_discuss" property="difficultCaseDiscuss" />
+        <result column="duty_shift_system" property="dutyShiftSystem" />
+        <result column="first_course_record" property="firstCourseRecord" />
+        <result column="leave_hospital" property="leaveHospital" />
+        <result column="nursing_system" property="nursingSystem" />
+        <result column="operation_discussion" property="operationDiscussion" />
+        <result column="pre_operative_discussion" property="preOperativeDiscussion" />
+        <result column="three_level_ward" property="threeLevelWard" />
+        <result column="critical_value" property="criticalValue" />
         <result column="remark" property="remark" />
     </resultMap>