Browse Source

标准病历相关接口

wangfeng 5 years ago
parent
commit
dc4c40c8e7
57 changed files with 1748 additions and 52 deletions
  1. 2 0
      config-server/src/main/resources/shared/mrman-service-dev.yml
  2. 2 0
      config-server/src/main/resources/shared/mrman-service-local.yml
  3. 2 0
      config-server/src/main/resources/shared/mrman-service-pre.yml
  4. 2 0
      config-server/src/main/resources/shared/mrman-service-pro.yml
  5. 2 0
      config-server/src/main/resources/shared/mrman-service-test.yml
  6. 111 0
      docs/036.20200609标准病例初始化脚本/qc_init_clauses.sql
  7. 21 0
      mrman-service/src/main/java/com/diagbot/client/BehospitalInfoHystrixClient.java
  8. 24 0
      mrman-service/src/main/java/com/diagbot/client/hystrix/BehospitalInfoHystrix.java
  9. 16 0
      mrman-service/src/main/java/com/diagbot/dto/MedBehospitalDeptDTO.java
  10. 38 0
      mrman-service/src/main/java/com/diagbot/dto/StdMissionDetailPageDTO.java
  11. 16 0
      mrman-service/src/main/java/com/diagbot/dto/StdMissionInfoPageDTO.java
  12. 18 0
      mrman-service/src/main/java/com/diagbot/dto/SthospitalInfoFindDTO.java
  13. 35 0
      mrman-service/src/main/java/com/diagbot/dto/SthospitalInfoStatiDTO.java
  14. 223 0
      mrman-service/src/main/java/com/diagbot/entity/StdMissionDetail.java
  15. 139 0
      mrman-service/src/main/java/com/diagbot/entity/StdMissionInfo.java
  16. 13 0
      mrman-service/src/main/java/com/diagbot/facade/MedBehospitalInfoFacade.java
  17. 73 1
      mrman-service/src/main/java/com/diagbot/facade/StdBehospitalInfoFacade.java
  18. 104 0
      mrman-service/src/main/java/com/diagbot/facade/StdMissionDetailFacade.java
  19. 76 0
      mrman-service/src/main/java/com/diagbot/facade/StdMissionInfoFacade.java
  20. 2 2
      mrman-service/src/main/java/com/diagbot/facade/StdQcresultDetailFacade.java
  21. 5 0
      mrman-service/src/main/java/com/diagbot/mapper/MedBehospitalInfoMapper.java
  22. 2 2
      mrman-service/src/main/java/com/diagbot/mapper/MedQcresultDetailMapper.java
  23. 5 1
      mrman-service/src/main/java/com/diagbot/mapper/StdBehospitalInfoMapper.java
  24. 20 0
      mrman-service/src/main/java/com/diagbot/mapper/StdMissionDetailMapper.java
  25. 20 0
      mrman-service/src/main/java/com/diagbot/mapper/StdMissionInfoMapper.java
  26. 5 0
      mrman-service/src/main/java/com/diagbot/service/MedBehospitalInfoService.java
  27. 1 1
      mrman-service/src/main/java/com/diagbot/service/MedQcresultDetailService.java
  28. 5 1
      mrman-service/src/main/java/com/diagbot/service/StdBehospitalInfoService.java
  29. 20 0
      mrman-service/src/main/java/com/diagbot/service/StdMissionDetailService.java
  30. 20 0
      mrman-service/src/main/java/com/diagbot/service/StdMissionInfoService.java
  31. 8 0
      mrman-service/src/main/java/com/diagbot/service/impl/MedBehospitalInfoServiceImpl.java
  32. 2 2
      mrman-service/src/main/java/com/diagbot/service/impl/MedQcresultDetailServiceImpl.java
  33. 8 1
      mrman-service/src/main/java/com/diagbot/service/impl/StdBehospitalInfoServiceImpl.java
  34. 27 0
      mrman-service/src/main/java/com/diagbot/service/impl/StdMissionDetailServiceImpl.java
  35. 27 0
      mrman-service/src/main/java/com/diagbot/service/impl/StdMissionInfoServiceImpl.java
  36. 18 0
      mrman-service/src/main/java/com/diagbot/vo/AnalyzeApiVO.java
  37. 17 0
      mrman-service/src/main/java/com/diagbot/vo/MedBehospitalDeptVO.java
  38. 15 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailClVO.java
  39. 26 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailPageVO.java
  40. 19 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailUpVO.java
  41. 15 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoAddVO.java
  42. 15 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoClearVO.java
  43. 17 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoPageVO.java
  44. 16 0
      mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoUpVO.java
  45. 22 0
      mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoClearVO.java
  46. 21 0
      mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoFindVO.java
  47. 20 0
      mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoStatiVO.java
  48. 21 2
      mrman-service/src/main/java/com/diagbot/web/MedBehospitalInfoController.java
  49. 0 1
      mrman-service/src/main/java/com/diagbot/web/MedQcresultDetailController.java
  50. 48 2
      mrman-service/src/main/java/com/diagbot/web/StdBehospitalInfoController.java
  51. 77 0
      mrman-service/src/main/java/com/diagbot/web/StdMissionDetailController.java
  52. 66 0
      mrman-service/src/main/java/com/diagbot/web/StdMissionInfoController.java
  53. 0 4
      mrman-service/src/main/java/com/diagbot/web/StdQcresultDetailController.java
  54. 52 31
      mrman-service/src/main/resources/mapper/MedBehospitalInfoMapper.xml
  55. 80 1
      mrman-service/src/main/resources/mapper/StdBehospitalInfoMapper.xml
  56. 62 0
      mrman-service/src/main/resources/mapper/StdMissionDetailMapper.xml
  57. 27 0
      mrman-service/src/main/resources/mapper/StdMissionInfoMapper.xml

+ 2 - 0
config-server/src/main/resources/shared/mrman-service-dev.yml

@@ -125,3 +125,5 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+
+qc.address: http://192.168.2.236:5858

+ 2 - 0
config-server/src/main/resources/shared/mrman-service-local.yml

@@ -125,3 +125,5 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+
+qc.address: http://192.168.2.236:5858

+ 2 - 0
config-server/src/main/resources/shared/mrman-service-pre.yml

@@ -125,3 +125,5 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+
+qc.address: http://192.168.2.122:5858

+ 2 - 0
config-server/src/main/resources/shared/mrman-service-pro.yml

@@ -125,3 +125,5 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+
+qc.address: http://192.168.2.121:5858

+ 2 - 0
config-server/src/main/resources/shared/mrman-service-test.yml

@@ -126,3 +126,5 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
+
+qc.address: http://192.168.2.241:5858

+ 111 - 0
docs/036.20200609标准病例初始化脚本/qc_init_clauses.sql

@@ -0,0 +1,111 @@
+use `qc`;
+-- ----------------------------
+-- Table structure for std_behospital_info
+-- ----------------------------
+DROP TABLE IF EXISTS `std_behospital_info`;
+CREATE TABLE `std_behospital_info` (
+  `behospital_code` varchar(16) NOT NULL COMMENT '病人住院ID',
+  `hospital_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '医院ID',
+  `name` varchar(32) NOT NULL COMMENT '姓名',
+  `sex` varchar(2) DEFAULT NULL COMMENT '性别(男,女)',
+  `birthday` datetime DEFAULT NULL COMMENT '出生日期',
+  `file_code` varchar(16) DEFAULT NULL COMMENT '档案号',
+  `qc_type_id` bigint(20) DEFAULT '0' COMMENT '质控类型',
+  `ward_code` varchar(16) DEFAULT NULL COMMENT '病区编码',
+  `ward_name` varchar(32) DEFAULT NULL COMMENT '病区名称',
+  `beh_dept_id` varchar(16) NOT NULL COMMENT '住院科室ID',
+  `beh_dept_name` varchar(64) NOT NULL COMMENT '住院科室名称',
+  `bed_code` varchar(12) DEFAULT NULL COMMENT '床位号',
+  `bed_name` varchar(12) DEFAULT NULL COMMENT '床位名称',
+  `insurance_name` varchar(50) DEFAULT NULL COMMENT '医保类别',
+  `job_type` varchar(30) DEFAULT NULL COMMENT '职业',
+  `behospital_date` datetime DEFAULT NULL COMMENT '入院时间',
+  `leave_hospital_date` datetime DEFAULT NULL COMMENT '出院时间',
+  `diagnose_icd` varchar(50) DEFAULT NULL COMMENT '疾病ICD编码',
+  `diagnose` text COMMENT '疾病名称',
+  `doctor_id` varchar(16) DEFAULT '' COMMENT '主治医生ID',
+  `doctor_name` varchar(50) DEFAULT '' COMMENT '主治医生姓名',
+  `beh_doctor_id` varchar(16) DEFAULT '' COMMENT '住院医生ID',
+  `beh_doctor_name` varchar(50) DEFAULT '' COMMENT '住院医生姓名',
+  `director_doctor_id` varchar(16) DEFAULT '' COMMENT '主任医生ID',
+  `director_doctor_name` varchar(50) DEFAULT '' COMMENT '主任医生姓名',
+  `is_placefile` varchar(2) NOT NULL DEFAULT '0' COMMENT '是否归档(0:未归档,1:已归档)',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除,Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人,0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  PRIMARY KEY (`behospital_code`),
+  KEY `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE,
+  KEY `idx_leave_hospital_date` (`leave_hospital_date`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='标准住院病历信息';
+
+-- ----------------------------
+-- Table structure for std_qcresult_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `std_qcresult_detail`;
+CREATE TABLE `std_qcresult_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `hospital_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '医院ID',
+  `behospital_code` varchar(255) NOT NULL DEFAULT '' COMMENT '病人住院ID',
+  `cases_id` bigint(20) DEFAULT NULL COMMENT '模块id',
+  `cases_score` decimal(5,1) DEFAULT NULL COMMENT '模块总分',
+  `cases_entry_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '条目ID',
+  `score` decimal(5,1) DEFAULT NULL COMMENT '人工修改分值',
+  `msg` varchar(255) DEFAULT NULL COMMENT '提示信息',
+  `info` varchar(500) DEFAULT '' COMMENT '质控返回提示信息',
+  `is_reject` int(3) DEFAULT '0' COMMENT '单项否决(1-单项否决 0-非)',
+  `grade_type` tinyint(4) DEFAULT '1' COMMENT '初始类型(1:机器,2:人工)',
+  `opt_type` tinyint(4) DEFAULT '1' COMMENT '操作类型(1:新增,2:删除,3:修改)',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除,Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人,0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `satisfy` int(10) DEFAULT NULL COMMENT '是否满足',
+  PRIMARY KEY (`id`),
+  KEY `idx_hospital_id` (`hospital_id`) USING BTREE,
+  KEY `idx_behospital_code` (`behospital_code`) USING BTREE,
+  KEY `idx_hospital_id_behospital_code` (`hospital_id`,`behospital_code`) USING BTREE,
+  KEY `idx_is_deleted` (`is_deleted`) USING BTREE,
+  KEY `idx_msg` (`msg`) USING BTREE,
+  KEY `idx_mix` (`hospital_id`,`behospital_code`,`is_deleted`) USING BTREE,
+  KEY `idx_cases_entry_id` (`cases_entry_id`) USING BTREE,
+  KEY `idx_cases_id` (`cases_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='标准质控评分明细信息';
+
+DROP TABLE IF EXISTS `std_mission_info`;
+CREATE TABLE `std_mission_info` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除,Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人,0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `mission_name` varchar(20) DEFAULT NULL,
+  `status` int(11) DEFAULT '0',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='任务信息表';
+
+DROP TABLE IF EXISTS `std_mission_detail`;
+CREATE TABLE `std_mission_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除,Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人,0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `mission_id` bigint(20) DEFAULT NULL,
+  `hospital_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '医院ID',
+  `cases_id` bigint(20) DEFAULT NULL COMMENT '模块id',
+  `cases_name` varchar(255) DEFAULT NULL,
+  `entry_code` varchar(255) NOT NULL DEFAULT '0' COMMENT '条目code',
+  `entry_name` varchar(255) DEFAULT NULL COMMENT '提示信息',
+  `amount` int(11) DEFAULT NULL,
+  `behospitalCodeStr` varchar(255) DEFAULT NULL,
+  `status` int(11) DEFAULT '0',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='任务信息详情表';

+ 21 - 0
mrman-service/src/main/java/com/diagbot/client/BehospitalInfoHystrixClient.java

@@ -0,0 +1,21 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.BehospitalInfoHystrix;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.AnalyzeApiVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 16:04
+ */
+@FeignClient(name = "qc", url = "${qc.address}",fallback = BehospitalInfoHystrix.class)
+public interface BehospitalInfoHystrixClient {
+    @PostMapping(value = "/qc/behospitalInfo/analyze_api")
+    RespDTO<Map<String, Object>> analyzeApi(@RequestBody AnalyzeApiVO analyzeApiVO);
+}

+ 24 - 0
mrman-service/src/main/java/com/diagbot/client/hystrix/BehospitalInfoHystrix.java

@@ -0,0 +1,24 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.BehospitalInfoHystrixClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.vo.AnalyzeApiVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 15:58
+ */
+@Component
+@Slf4j
+public class BehospitalInfoHystrix implements BehospitalInfoHystrixClient {
+    @Override
+    public RespDTO<Map<String, Object>> analyzeApi(AnalyzeApiVO analyzeApiVO) {
+        log.error("【hystrix】调用{}异常", "analyzeApi");
+        return null;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-12 10:00
+ */
+@Setter
+@Getter
+public class MedBehospitalDeptDTO {
+    private Long deptId;
+    private String deptName;
+}

+ 38 - 0
mrman-service/src/main/java/com/diagbot/dto/StdMissionDetailPageDTO.java

@@ -0,0 +1,38 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 14:30
+ */
+@Setter
+@Getter
+public class StdMissionDetailPageDTO {
+    private Long id;
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /*    private String hospitalName;*/
+    /**
+     * 模块id
+     */
+    private Long casesId;
+
+    private String casesName;
+
+    private String entryCode;
+    private String entryName;
+
+    /*private String msg;*/
+
+    private Integer amount;
+
+    private String behospitalCodeStr;
+
+    private Integer status;
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-15 9:42
+ */
+@Setter
+@Getter
+public class StdMissionInfoPageDTO {
+    private Long id;
+    private String missionName;
+}

+ 18 - 0
mrman-service/src/main/java/com/diagbot/dto/SthospitalInfoFindDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-10 19:43
+ */
+@Setter
+@Getter
+public class SthospitalInfoFindDTO extends SthospitalInfoPageDTO{
+    /**
+     * 0存在,1不存在
+     */
+    private  Integer status;
+}

+ 35 - 0
mrman-service/src/main/java/com/diagbot/dto/SthospitalInfoStatiDTO.java

@@ -0,0 +1,35 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 10:49
+ */
+@Setter
+@Getter
+public class SthospitalInfoStatiDTO {
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+/*    private String hospitalName;*/
+    /**
+     * 模块id
+     */
+    private Long casesId;
+
+    private String casesName;
+
+    private String entryCode;
+    private String entryName;
+
+    private String msg;
+
+    private Integer amount;
+
+    private String behospitalCodeStr;
+}

+ 223 - 0
mrman-service/src/main/java/com/diagbot/entity/StdMissionDetail.java

@@ -0,0 +1,223 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+public class StdMissionDetail 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 missionId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 模块id
+     */
+    private Long casesId;
+
+    private String casesName;
+
+    /**
+     * 条目code
+     */
+    private String entryCode;
+
+    /**
+     * 提示信息
+     */
+    private String entryName;
+
+    private Integer amount;
+
+    @TableField("behospitalCodeStr")
+    private String behospitalCodeStr;
+
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    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 getMissionId() {
+        return missionId;
+    }
+
+    public void setMissionId(Long missionId) {
+        this.missionId = missionId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public Long getCasesId() {
+        return casesId;
+    }
+
+    public void setCasesId(Long casesId) {
+        this.casesId = casesId;
+    }
+    public String getCasesName() {
+        return casesName;
+    }
+
+    public void setCasesName(String casesName) {
+        this.casesName = casesName;
+    }
+    public String getEntryCode() {
+        return entryCode;
+    }
+
+    public void setEntryCode(String entryCode) {
+        this.entryCode = entryCode;
+    }
+    public String getEntryName() {
+        return entryName;
+    }
+
+    public void setEntryName(String entryName) {
+        this.entryName = entryName;
+    }
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+    public String getBehospitalCodeStr() {
+        return behospitalCodeStr;
+    }
+
+    public void setBehospitalCodeStr(String behospitalCodeStr) {
+        this.behospitalCodeStr = behospitalCodeStr;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "StdMissionDetail{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", missionId=" + missionId +
+            ", hospitalId=" + hospitalId +
+            ", casesId=" + casesId +
+            ", casesName=" + casesName +
+            ", entryCode=" + entryCode +
+            ", entryName=" + entryName +
+            ", amount=" + amount +
+            ", behospitalCodeStr=" + behospitalCodeStr +
+            ", status=" + status +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 139 - 0
mrman-service/src/main/java/com/diagbot/entity/StdMissionInfo.java

@@ -0,0 +1,139 @@
+package com.diagbot.entity;
+
+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-06-12
+ */
+public class StdMissionInfo 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 missionName;
+
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    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 getMissionName() {
+        return missionName;
+    }
+
+    public void setMissionName(String missionName) {
+        this.missionName = missionName;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "StdMissionInfo{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", missionName=" + missionName +
+            ", status=" + status +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 13 - 0
mrman-service/src/main/java/com/diagbot/facade/MedBehospitalInfoFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.MedBehospitalDeptDTO;
+import com.diagbot.service.MedBehospitalInfoService;
 import com.diagbot.service.impl.MedBehospitalInfoServiceImpl;
+import com.diagbot.vo.MedBehospitalDeptVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @author wangfeng
  * @Description:
@@ -10,5 +16,12 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class MedBehospitalInfoFacade extends MedBehospitalInfoServiceImpl {
+    @Autowired
+    MedBehospitalInfoService medBehospitalInfoService;
+
+    public List<MedBehospitalDeptDTO> findhospitalDepts(MedBehospitalDeptVO medBehospitalDeptVO) {
+
+        return medBehospitalInfoService.findhospitalDept(medBehospitalDeptVO);
 
+    }
 }

+ 73 - 1
mrman-service/src/main/java/com/diagbot/facade/StdBehospitalInfoFacade.java

@@ -2,8 +2,11 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.BehospitalInfoHystrixClient;
 import com.diagbot.dto.MedQcresultDetailAllDTO;
+import com.diagbot.dto.SthospitalInfoFindDTO;
 import com.diagbot.dto.SthospitalInfoPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
 import com.diagbot.entity.MedBehospitalInfo;
 import com.diagbot.entity.StdBehospitalInfo;
 import com.diagbot.entity.StdQcresultDetail;
@@ -14,11 +17,14 @@ import com.diagbot.service.StdBehospitalInfoService;
 import com.diagbot.service.impl.StdBehospitalInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.AnalyzeApiVO;
 import com.diagbot.vo.MedQcresultDetailAllVO;
 import com.diagbot.vo.StdQcresultDetailVO;
+import com.diagbot.vo.SthospitalInfoClearVO;
+import com.diagbot.vo.SthospitalInfoFindVO;
 import com.diagbot.vo.SthospitalInfoPageVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
 import com.diagbot.vo.SthospitalInfoUpdataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -42,6 +48,8 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
     MedQcresultDetailFacade medQcresultDetailFacade;
     @Autowired
     StdQcresultDetailFacade stdQcresultDetailFacade;
+    @Autowired
+    BehospitalInfoHystrixClient behospitalInfoHystrixClient;
 
     public IPage<SthospitalInfoPageDTO> getSthospitalInfoPages(SthospitalInfoPageVO sthospitalInfoPageVO) {
         return stdBehospitalInfoService.getStdPage(sthospitalInfoPageVO);
@@ -98,4 +106,68 @@ public class StdBehospitalInfoFacade extends StdBehospitalInfoServiceImpl {
 
         return res;
     }
+
+    public Boolean clearSthospitalInfos(SthospitalInfoClearVO sthospitalInfoClearVO) {
+        boolean res = false;
+        //先删除原数据
+        QueryWrapper<StdBehospitalInfo> stdBehospitalInfoQuery = new QueryWrapper<>();
+        stdBehospitalInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", sthospitalInfoClearVO.getHospitalId())
+                .eq("behospital_code", sthospitalInfoClearVO.getBehospitalCode());
+        res = stdBehospitalInfoService.remove(stdBehospitalInfoQuery);
+        QueryWrapper<StdQcresultDetail> stdQcresultDetailQuery = new QueryWrapper<>();
+        stdQcresultDetailQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", sthospitalInfoClearVO.getHospitalId())
+                .eq("behospital_code", sthospitalInfoClearVO.getBehospitalCode());
+        res = stdQcresultDetailFacade.remove(stdQcresultDetailQuery);
+        return res;
+    }
+
+    public SthospitalInfoFindDTO findSthospitalInfos(SthospitalInfoFindVO sthospitalInfoFindVO) {
+        SthospitalInfoFindDTO stdDataDTO = new SthospitalInfoFindDTO();
+        //先去原始表里找
+        QueryWrapper<MedBehospitalInfo> medbeHQuery = new QueryWrapper<>();
+        medbeHQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("behospital_code", sthospitalInfoFindVO.getBehospitalCode())
+                .eq("hospital_id", sthospitalInfoFindVO.getHospitalId());
+        MedBehospitalInfo medBehospitalInfo = medBehospitalInfoFacade.getOne(medbeHQuery);
+        if (medBehospitalInfo == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例没有找到");
+        }
+        QueryWrapper<StdBehospitalInfo> stdBehospitalInfoQuery = new QueryWrapper<>();
+        stdBehospitalInfoQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", sthospitalInfoFindVO.getHospitalId())
+                .eq("behospital_code", sthospitalInfoFindVO.getBehospitalCode());
+        StdBehospitalInfo stdData = stdBehospitalInfoService.getOne(stdBehospitalInfoQuery);
+        if (stdData != null) {
+            BeanUtil.copyProperties(medBehospitalInfo, stdDataDTO);
+            stdDataDTO.setStatus(0);
+        } else {
+            BeanUtil.copyProperties(medBehospitalInfo, stdDataDTO);
+            stdDataDTO.setStatus(1);
+        }
+        return stdDataDTO;
+    }
+
+    public IPage<SthospitalInfoStatiDTO> getStatistics(SthospitalInfoStatiVO sthospitalInfoStatiVO) {
+        return stdBehospitalInfoService.getStatistic(sthospitalInfoStatiVO);
+    }
+
+    public boolean analyze() {
+        QueryWrapper<StdBehospitalInfo> stdBehospitalInfoQuery = new QueryWrapper<>();
+        stdBehospitalInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey());
+        List<StdBehospitalInfo> list = stdBehospitalInfoService.list(stdBehospitalInfoQuery);
+        if (ListUtil.isNotEmpty(list)) {
+            for (StdBehospitalInfo data : list) {
+                AnalyzeApiVO analyzeApiVO = new AnalyzeApiVO();
+                analyzeApiVO.setBehospitalCode(data.getBehospitalCode());
+                analyzeApiVO.setHospitalId(data.getHospitalId());
+                behospitalInfoHystrixClient.analyzeApi(analyzeApiVO);
+            }
+        }
+        return true;
+    }
 }

+ 104 - 0
mrman-service/src/main/java/com/diagbot/facade/StdMissionDetailFacade.java

@@ -0,0 +1,104 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
+import com.diagbot.entity.StdMissionDetail;
+import com.diagbot.entity.StdMissionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.StdMissionDetailService;
+import com.diagbot.service.impl.StdMissionDetailServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.StdMissionDetailClVO;
+import com.diagbot.vo.StdMissionDetailPageVO;
+import com.diagbot.vo.StdMissionDetailUpVO;
+import com.diagbot.vo.StdMissionInfoAddVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-12 16:50
+ */
+@Component
+public class StdMissionDetailFacade extends StdMissionDetailServiceImpl {
+
+    @Autowired
+    StdMissionDetailService stdMissionDetailService;
+    @Autowired
+    StdBehospitalInfoFacade stdBehospitalInfoFacade;
+    @Autowired
+    StdMissionInfoFacade stdMissionInfoFacade;
+    public IPage<StdMissionDetailPageDTO> getMissionDetailPages(StdMissionDetailPageVO stdMissionDetailPageVO) {
+        return stdMissionDetailService.getMissionDetailPage(stdMissionDetailPageVO);
+    }
+
+    public boolean addMissionDetails(StdMissionInfoAddVO stdMissionInfoAddVO) {
+        //验证任务名是否存在
+        QueryWrapper<StdMissionInfo> stdQcresultTaskQuery =new QueryWrapper<>();
+        stdQcresultTaskQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("mission_name",stdMissionInfoAddVO.getMissionName());
+        int sum = stdMissionInfoFacade.count(stdQcresultTaskQuery);
+        if(sum > 0){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该任务名已存在!");
+        }
+        //添加数据生成任务
+        Date now = DateUtil.now();
+        StdMissionInfo stdMissionInfo =new StdMissionInfo();
+        BeanUtil.copyProperties(stdMissionInfoAddVO, stdMissionInfo);
+        stdMissionInfo.setGmtCreate(now);
+        stdMissionInfo.setGmtModified(now);
+        boolean res = stdMissionInfoFacade.save(stdMissionInfo);
+        if(res){
+            Long missionId =stdMissionInfo.getId();
+            SthospitalInfoStatiVO sthospitalInfoPageVO = new SthospitalInfoStatiVO();
+            sthospitalInfoPageVO.setPages(1);
+            sthospitalInfoPageVO.setSize(5000);
+            IPage<SthospitalInfoStatiDTO> sthospital = stdBehospitalInfoFacade.getStatistic(sthospitalInfoPageVO);
+            List<SthospitalInfoStatiDTO> records = sthospital.getRecords();
+            List<StdMissionDetail> missionDetailList = new ArrayList<>();
+            for(SthospitalInfoStatiDTO data:records){
+                StdMissionDetail stdMissionDetail = new StdMissionDetail();
+                BeanUtil.copyProperties(data, stdMissionDetail);
+                stdMissionDetail.setMissionId(missionId);
+                stdMissionDetail.setGmtCreate(now);
+                stdMissionDetail.setGmtModified(now);
+                missionDetailList.add(stdMissionDetail);
+            }
+            res = stdMissionDetailService.saveBatch(missionDetailList);
+        }
+
+
+        return res;
+    }
+
+    public boolean updateMissionDetails(StdMissionDetailUpVO stdMissionDetailUpVO) {
+        Date now = DateUtil.now();
+        return this.update(new StdMissionDetail(), new UpdateWrapper<StdMissionDetail>()
+                .eq("id", stdMissionDetailUpVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("gmt_modified", now)
+                .set("status", stdMissionDetailUpVO.getStatus())
+                .set("remark",stdMissionDetailUpVO.getRemark()));
+    }
+
+    public boolean clearMissionDetails(StdMissionDetailClVO stdMissionDetailClVO) {
+        Date now = DateUtil.now();
+        return this.update(new StdMissionDetail(), new UpdateWrapper<StdMissionDetail>()
+                .in("id", stdMissionDetailClVO.getId())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("gmt_modified", now)
+                .set("is_deleted", IsDeleteEnum.Y.getKey()));
+    }
+}

+ 76 - 0
mrman-service/src/main/java/com/diagbot/facade/StdMissionInfoFacade.java

@@ -0,0 +1,76 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionInfoPageDTO;
+import com.diagbot.entity.StdMissionDetail;
+import com.diagbot.entity.StdMissionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.StdMissionInfoService;
+import com.diagbot.service.impl.StdMissionInfoServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.StdMissionInfoClearVO;
+import com.diagbot.vo.StdMissionInfoPageVO;
+import com.diagbot.vo.StdMissionInfoUpVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-15 9:40
+ */
+@Component
+public class StdMissionInfoFacade extends StdMissionInfoServiceImpl {
+    @Autowired
+    StdMissionInfoService stdMissionInfoService;
+    @Autowired
+    StdMissionDetailFacade stdMissionDetailFacade;
+
+    public  IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO) {
+        return stdMissionInfoService.getMissionInfoPages(stdMissionInfoPageVO);
+    }
+
+    public boolean updataMissionInfos(StdMissionInfoUpVO stdMissionInfoUpVO) {
+        Date now = DateUtil.now();
+        QueryWrapper<StdMissionInfo> missionInfoQuery = new QueryWrapper<>();
+        missionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .ne("id",stdMissionInfoUpVO.getId() == null ? -1 : stdMissionInfoUpVO.getId())
+                .eq("mission_name",stdMissionInfoUpVO.getMissionName());
+        int count = stdMissionInfoService.count(missionInfoQuery);
+        if(count > 0){
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该任务名已存在!");
+        }
+        UpdateWrapper<StdMissionInfo> missionInfoUpdate = new UpdateWrapper<>();
+        missionInfoUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id",stdMissionInfoUpVO.getId())
+                .set("mission_name",stdMissionInfoUpVO.getMissionName())
+                .set("gmt_modified",now);
+
+        return stdMissionInfoService.update(missionInfoUpdate);
+    }
+
+    public boolean clearMissionInfos(StdMissionInfoClearVO stdMissionInfoClearVO) {
+        Date now = DateUtil.now();
+        //删除该任务
+        UpdateWrapper<StdMissionInfo> missionInfoUpdate = new UpdateWrapper<>();
+        missionInfoUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id",stdMissionInfoClearVO.getId())
+                .set("is_deleted",IsDeleteEnum.Y.getKey())
+                .set("gmt_modified",now);
+        boolean res = stdMissionInfoService.update(missionInfoUpdate);
+        //删除该任务所有明细
+        UpdateWrapper<StdMissionDetail> missionDetailUpdate = new UpdateWrapper<>();
+        missionDetailUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("mission_id",stdMissionInfoClearVO.getId())
+                .set("is_deleted",IsDeleteEnum.Y.getKey())
+                .set("gmt_modified",now);
+        stdMissionDetailFacade.update(missionDetailUpdate);
+        return res;
+    }
+}

+ 2 - 2
mrman-service/src/main/java/com/diagbot/facade/StdQcresultDetailFacade.java

@@ -28,8 +28,8 @@ public class StdQcresultDetailFacade extends StdQcresultDetailServiceImpl {
         QueryWrapper<StdQcresultDetail> stdQcresultDetailQuery = new QueryWrapper<>();
         stdQcresultDetailQuery
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id",StdQcresultDetailVO.getHospitalId())
-                .eq("behospital_code",StdQcresultDetailVO.getBehospitalCode());
+                .eq("hospital_id", StdQcresultDetailVO.getHospitalId())
+                .eq("behospital_code", StdQcresultDetailVO.getBehospitalCode());
         boolean res = this.remove(stdQcresultDetailQuery);
         return stdQcresultDetailService.saveBatch(StdQcresultDetailVO.getQcresultDetail());
     }

+ 5 - 0
mrman-service/src/main/java/com/diagbot/mapper/MedBehospitalInfoMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.MedBehospitalDeptDTO;
 import com.diagbot.entity.MedBehospitalInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.MedBehospitalDeptVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MedBehospitalInfoMapper extends BaseMapper<MedBehospitalInfo> {
 
+    List<MedBehospitalDeptDTO> findhospitalDept(MedBehospitalDeptVO medBehospitalDeptVO);
 }

+ 2 - 2
mrman-service/src/main/java/com/diagbot/mapper/MedQcresultDetailMapper.java

@@ -1,8 +1,8 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.MedQcresultDetailAllDTO;
 import com.diagbot.entity.MedQcresultDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.MedQcresultDetailAllVO;
 
 import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * <p>
  * 质控评分明细信息
-每次评分增加一条信息,前面所有评分is_deleted全部设置为Y Mapper 接口
+ * 每次评分增加一条信息,前面所有评分is_deleted全部设置为Y Mapper 接口
  * </p>
  *
  * @author wangfeng

+ 5 - 1
mrman-service/src/main/java/com/diagbot/mapper/StdBehospitalInfoMapper.java

@@ -1,10 +1,12 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.SthospitalInfoPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
 import com.diagbot.entity.StdBehospitalInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.SthospitalInfoPageVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
 
 /**
  * <p>
@@ -17,4 +19,6 @@ import com.diagbot.vo.SthospitalInfoPageVO;
 public interface StdBehospitalInfoMapper extends BaseMapper<StdBehospitalInfo> {
 
     IPage<SthospitalInfoPageDTO> getStdPage(SthospitalInfoPageVO sthospitalInfoPageVO);
+
+    IPage<SthospitalInfoStatiDTO> getStatistic(SthospitalInfoStatiVO sthospitalInfoStatiVO);
 }

+ 20 - 0
mrman-service/src/main/java/com/diagbot/mapper/StdMissionDetailMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.entity.StdMissionDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.StdMissionDetailPageVO;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+public interface StdMissionDetailMapper extends BaseMapper<StdMissionDetail> {
+
+    IPage<StdMissionDetailPageDTO> getMissionDetailPage(StdMissionDetailPageVO stdMissionDetailPageVO);
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/mapper/StdMissionInfoMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionInfoPageDTO;
+import com.diagbot.entity.StdMissionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.StdMissionInfoPageVO;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+public interface StdMissionInfoMapper extends BaseMapper<StdMissionInfo> {
+
+    IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO);
+}

+ 5 - 0
mrman-service/src/main/java/com/diagbot/service/MedBehospitalInfoService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.MedBehospitalDeptDTO;
 import com.diagbot.entity.MedBehospitalInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.MedBehospitalDeptVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface MedBehospitalInfoService extends IService<MedBehospitalInfo> {
 
+    List<MedBehospitalDeptDTO> findhospitalDept(MedBehospitalDeptVO medBehospitalDeptVO);
 }

+ 1 - 1
mrman-service/src/main/java/com/diagbot/service/MedQcresultDetailService.java

@@ -1,8 +1,8 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.MedQcresultDetailAllDTO;
 import com.diagbot.entity.MedQcresultDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.MedQcresultDetailAllVO;
 
 import java.util.List;

+ 5 - 1
mrman-service/src/main/java/com/diagbot/service/StdBehospitalInfoService.java

@@ -1,10 +1,12 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.SthospitalInfoPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
 import com.diagbot.entity.StdBehospitalInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.SthospitalInfoPageVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
 
 /**
  * <p>
@@ -17,4 +19,6 @@ import com.diagbot.vo.SthospitalInfoPageVO;
 public interface StdBehospitalInfoService extends IService<StdBehospitalInfo> {
 
     IPage<SthospitalInfoPageDTO> getStdPage(SthospitalInfoPageVO sthospitalInfoPageVO);
+
+    IPage<SthospitalInfoStatiDTO> getStatistic(SthospitalInfoStatiVO sthospitalInfoStatiVO);
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.entity.StdMissionDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.StdMissionDetailPageVO;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+public interface StdMissionDetailService extends IService<StdMissionDetail> {
+
+    IPage<StdMissionDetailPageDTO> getMissionDetailPage(StdMissionDetailPageVO stdMissionDetailPageVO);
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionInfoPageDTO;
+import com.diagbot.entity.StdMissionInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.StdMissionInfoPageVO;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+public interface StdMissionInfoService extends IService<StdMissionInfo> {
+
+    IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO);
+}

+ 8 - 0
mrman-service/src/main/java/com/diagbot/service/impl/MedBehospitalInfoServiceImpl.java

@@ -1,11 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.MedBehospitalDeptDTO;
 import com.diagbot.entity.MedBehospitalInfo;
 import com.diagbot.mapper.MedBehospitalInfoMapper;
 import com.diagbot.service.MedBehospitalInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.MedBehospitalDeptVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 住院病历信息 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class MedBehospitalInfoServiceImpl extends ServiceImpl<MedBehospitalInfoMapper, MedBehospitalInfo> implements MedBehospitalInfoService {
 
+    @Override
+    public List<MedBehospitalDeptDTO> findhospitalDept(MedBehospitalDeptVO medBehospitalDeptVO) {
+        return baseMapper.findhospitalDept(medBehospitalDeptVO);
+    }
 }

+ 2 - 2
mrman-service/src/main/java/com/diagbot/service/impl/MedQcresultDetailServiceImpl.java

@@ -1,10 +1,10 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.MedQcresultDetailAllDTO;
 import com.diagbot.entity.MedQcresultDetail;
 import com.diagbot.mapper.MedQcresultDetailMapper;
 import com.diagbot.service.MedQcresultDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.MedQcresultDetailAllVO;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * <p>
  * 质控评分明细信息
-每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务实现类
+ * 每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务实现类
  * </p>
  *
  * @author wangfeng

+ 8 - 1
mrman-service/src/main/java/com/diagbot/service/impl/StdBehospitalInfoServiceImpl.java

@@ -1,12 +1,14 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.SthospitalInfoPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
 import com.diagbot.entity.StdBehospitalInfo;
 import com.diagbot.mapper.StdBehospitalInfoMapper;
 import com.diagbot.service.StdBehospitalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.SthospitalInfoPageVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -24,4 +26,9 @@ public class StdBehospitalInfoServiceImpl extends ServiceImpl<StdBehospitalInfoM
     public IPage<SthospitalInfoPageDTO> getStdPage(SthospitalInfoPageVO sthospitalInfoPageVO) {
         return baseMapper.getStdPage(sthospitalInfoPageVO);
     }
+
+    @Override
+    public IPage<SthospitalInfoStatiDTO> getStatistic(SthospitalInfoStatiVO sthospitalInfoStatiVO) {
+        return baseMapper.getStatistic(sthospitalInfoStatiVO);
+    }
 }

+ 27 - 0
mrman-service/src/main/java/com/diagbot/service/impl/StdMissionDetailServiceImpl.java

@@ -0,0 +1,27 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.entity.StdMissionDetail;
+import com.diagbot.mapper.StdMissionDetailMapper;
+import com.diagbot.service.StdMissionDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.StdMissionDetailPageVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+@Service
+public class StdMissionDetailServiceImpl extends ServiceImpl<StdMissionDetailMapper, StdMissionDetail> implements StdMissionDetailService {
+
+    @Override
+    public IPage<StdMissionDetailPageDTO> getMissionDetailPage(StdMissionDetailPageVO stdMissionDetailPageVO) {
+        return baseMapper.getMissionDetailPage(stdMissionDetailPageVO);
+    }
+}

+ 27 - 0
mrman-service/src/main/java/com/diagbot/service/impl/StdMissionInfoServiceImpl.java

@@ -0,0 +1,27 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.StdMissionInfoPageDTO;
+import com.diagbot.entity.StdMissionInfo;
+import com.diagbot.mapper.StdMissionInfoMapper;
+import com.diagbot.service.StdMissionInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.StdMissionInfoPageVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+@Service
+public class StdMissionInfoServiceImpl extends ServiceImpl<StdMissionInfoMapper, StdMissionInfo> implements StdMissionInfoService {
+
+    @Override
+    public IPage<StdMissionInfoPageDTO> getMissionInfoPages(StdMissionInfoPageVO stdMissionInfoPageVO) {
+        return baseMapper.getMissionInfoPages(stdMissionInfoPageVO);
+    }
+}

+ 18 - 0
mrman-service/src/main/java/com/diagbot/vo/AnalyzeApiVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2020/4/13 18:31
+ */
+@Data
+public class AnalyzeApiVO {
+
+    private String behospitalCode; // 病历id
+    private Long hospitalId; //医院ID
+    @ApiModelProperty(hidden = true)
+    private Boolean isTask = true; // 使用hospitalId传入的值
+}

+ 17 - 0
mrman-service/src/main/java/com/diagbot/vo/MedBehospitalDeptVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-12 10:01
+ */
+@Setter
+@Getter
+public class MedBehospitalDeptVO {
+    private Long deptId;
+    private String deptName;
+    private Long hospitalId;
+}

+ 15 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailClVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-12 17:02
+ */
+@Setter
+@Getter
+public class StdMissionDetailClVO {
+    private Long id;
+}

+ 26 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailPageVO.java

@@ -0,0 +1,26 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+import sun.plugin2.message.Message;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 14:33
+ */
+@Setter
+@Getter
+public class StdMissionDetailPageVO extends Page {
+
+    @NotNull(message = "请输入任务Id")
+    private Long missionId;
+    private Long hospitalId;
+    private Long casesId;
+    private String entryCode;
+    private String entryName;
+    private Integer status;
+}

+ 19 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionDetailUpVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 15:08
+ */
+@Setter
+@Getter
+public class StdMissionDetailUpVO {
+    private Long id;
+    private Integer status;
+    private String remark;
+}

+ 15 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoAddVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 14:54
+ */
+@Setter
+@Getter
+public class StdMissionInfoAddVO {
+    private String missionName;
+}

+ 15 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoClearVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-15 9:58
+ */
+@Setter
+@Getter
+public class StdMissionInfoClearVO {
+    private  Long id;
+}

+ 17 - 0
mrman-service/src/main/java/com/diagbot/vo/StdMissionInfoPageVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-15 9:42
+ */
+@Setter
+@Getter
+public class StdMissionInfoPageVO extends Page {
+    private String missionName;
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-15 9:58
+ */
+@Setter
+@Getter
+public class StdMissionInfoUpVO {
+    private  Long id;
+    private  String missionName;
+}

+ 22 - 0
mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoClearVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-10 19:18
+ */
+@Setter
+@Getter
+public class SthospitalInfoClearVO {
+
+    @NotBlank(message = "病人住院序号不能为空")
+    private String behospitalCode;
+    @NotNull(message = "医院id不能为空")
+    private Long hospitalId;
+}

+ 21 - 0
mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoFindVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-10 19:42
+ */
+@Setter
+@Getter
+public class SthospitalInfoFindVO {
+    @NotBlank(message = "病人住院序号不能为空")
+    private String behospitalCode;
+    @NotNull(message = "医院id不能为空")
+    private Long hospitalId;
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/vo/SthospitalInfoStatiVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-06-11 11:01
+ */
+@Setter
+@Getter
+public class SthospitalInfoStatiVO extends Page {
+
+    private Long hospitalId;
+    private Long casesId;
+    private String entryCode;
+    private String entryName;
+}

+ 21 - 2
mrman-service/src/main/java/com/diagbot/web/MedBehospitalInfoController.java

@@ -1,14 +1,24 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.MedBehospitalDeptDTO;
+import com.diagbot.dto.MedQcresultDetailAllDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedBehospitalInfoFacade;
+import com.diagbot.vo.MedBehospitalDeptVO;
+import com.diagbot.vo.MedQcresultDetailAllVO;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * <p>
  * 住院病历信息 前端控制器
@@ -24,4 +34,13 @@ public class MedBehospitalInfoController {
     @Autowired
     MedBehospitalInfoFacade medBehospitalInfoFacade;
 
+    @ApiOperation(value = "查询标准病例所有科室[by:wangfeng]",
+            notes = "查询标准病例所有科室")
+    @PostMapping("/findhospitalDept")
+    @SysLogger("findhospitalDept")
+    public RespDTO<List<MedBehospitalDeptDTO>> findhospitalDept(@RequestBody  MedBehospitalDeptVO medBehospitalDeptVO) {
+        List<MedBehospitalDeptDTO> data = medBehospitalInfoFacade.findhospitalDepts(medBehospitalDeptVO);
+        return RespDTO.onSuc(data);
+    }
+
 }

+ 0 - 1
mrman-service/src/main/java/com/diagbot/web/MedQcresultDetailController.java

@@ -6,7 +6,6 @@ import com.diagbot.dto.MedQcresultDetailAllDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedQcresultDetailFacade;
 import com.diagbot.vo.MedQcresultDetailAllVO;
-import com.diagbot.vo.SthospitalInfoUpdataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

+ 48 - 2
mrman-service/src/main/java/com/diagbot/web/StdBehospitalInfoController.java

@@ -4,9 +4,14 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SthospitalInfoFindDTO;
 import com.diagbot.dto.SthospitalInfoPageDTO;
+import com.diagbot.dto.SthospitalInfoStatiDTO;
 import com.diagbot.facade.StdBehospitalInfoFacade;
+import com.diagbot.vo.SthospitalInfoClearVO;
+import com.diagbot.vo.SthospitalInfoFindVO;
 import com.diagbot.vo.SthospitalInfoPageVO;
+import com.diagbot.vo.SthospitalInfoStatiVO;
 import com.diagbot.vo.SthospitalInfoUpdataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,13 +47,54 @@ public class StdBehospitalInfoController {
         IPage<SthospitalInfoPageDTO> data = stdBehospitalInfoFacade.getSthospitalInfoPages(sthospitalInfoPageVO);
         return RespDTO.onSuc(data);
     }
+
     @ApiOperation(value = "更新该条标准病例[by:wangfeng]",
             notes = "更新该条标准病例")
     @PostMapping("/updataSthospitalInfo")
     @SysLogger("updataSthospitalInfo")
     @Transactional
-    public RespDTO<Boolean> updataSthospitalInfo(@RequestBody @Valid SthospitalInfoUpdataVO SthospitalInfoUpdataVO) {
-        Boolean res = stdBehospitalInfoFacade.updataSthospitalInfos(SthospitalInfoUpdataVO);
+    public RespDTO<Boolean> updataSthospitalInfo(@RequestBody @Valid SthospitalInfoUpdataVO sthospitalInfoUpdataVO) {
+        Boolean res = stdBehospitalInfoFacade.updataSthospitalInfos(sthospitalInfoUpdataVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "查找病例[by:wangfeng]",
+            notes = "查找病例")
+    @PostMapping("/findSthospitalInfo")
+    @SysLogger("findSthospitalInfo")
+    @Transactional
+    public RespDTO<SthospitalInfoFindDTO> findSthospitalInfo(@RequestBody @Valid SthospitalInfoFindVO sthospitalInfoFindVO) {
+        SthospitalInfoFindDTO data = stdBehospitalInfoFacade.findSthospitalInfos(sthospitalInfoFindVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "根据病例号删除标准病例[by:wangfeng]",
+            notes = "根据病例号删除标准病例")
+    @PostMapping("/clearSthospitalInfo")
+    @SysLogger("clearSthospitalInfo")
+    @Transactional
+    public RespDTO<Boolean> clearSthospitalInfo(@RequestBody @Valid SthospitalInfoClearVO sthospitalInfoClearVO) {
+        Boolean res = stdBehospitalInfoFacade.clearSthospitalInfos(sthospitalInfoClearVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "自动化测试统计[by:wangfeng]",
+            notes = "自动化测试统计")
+    @PostMapping("/getStatistic")
+    @SysLogger("getStatistic")
+    @Transactional
+    public RespDTO<IPage<SthospitalInfoStatiDTO>> getStatistic(@RequestBody @Valid SthospitalInfoStatiVO sthospitalInfoStatiVO) {
+        IPage<SthospitalInfoStatiDTO> data = stdBehospitalInfoFacade.getStatistics(sthospitalInfoStatiVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "标准病例重新评分[by:wangfeng]",
+            notes = "标准病例重新评分")
+    @PostMapping("/analyze")
+    @SysLogger("analyze")
+    @Transactional
+    public RespDTO<Boolean> analyze() {
+        boolean res = stdBehospitalInfoFacade.analyze();
         return RespDTO.onSuc(res);
     }
 }

+ 77 - 0
mrman-service/src/main/java/com/diagbot/web/StdMissionDetailController.java

@@ -0,0 +1,77 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.facade.StdMissionDetailFacade;
+import com.diagbot.vo.StdMissionDetailClVO;
+import com.diagbot.vo.StdMissionDetailPageVO;
+import com.diagbot.vo.StdMissionDetailUpVO;
+import com.diagbot.vo.StdMissionInfoAddVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+
+@RestController
+@RequestMapping("/stdMissionDetail")
+@Api(value = "任务详情信息相关接口", tags = { "任务详情信息相关接口" })
+public class StdMissionDetailController {
+    @Autowired
+    StdMissionDetailFacade stdMissionDetailFacade;
+
+    @ApiOperation(value = "分页获取任务详情信息[by:wangfeng]",
+            notes = "分页获取任务详情信息")
+    @PostMapping("/getMissionDetailPage")
+    @SysLogger("getMissionDetailPage")
+    public RespDTO<IPage<StdMissionDetailPageDTO>> getMissionDetailPage(@RequestBody @Valid  StdMissionDetailPageVO stdQcresultTaskPageVO) {
+        IPage<StdMissionDetailPageDTO> data = stdMissionDetailFacade.getMissionDetailPages(stdQcresultTaskPageVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "一键添加任务信息[by:wangfeng]",
+            notes = "一键添加任务信息")
+    @PostMapping("/addMissionDetail")
+    @SysLogger("addMissionDetail")
+    @Transactional
+    public RespDTO<Boolean> addMissionDetail(@RequestBody StdMissionInfoAddVO stdMissionInfoAddVO) {
+        boolean res = stdMissionDetailFacade.addMissionDetails(stdMissionInfoAddVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "修改任务信息[by:wangfeng]",
+            notes = "修改任务信息")
+    @PostMapping("/updateMissionDetail")
+    @SysLogger("updateMissionDetail")
+    @Transactional
+    public RespDTO<Boolean> updateMissionDetail(@RequestBody StdMissionDetailUpVO stdQcresultTaskUpVO) {
+        boolean res = stdMissionDetailFacade.updateMissionDetails(stdQcresultTaskUpVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "删除任务信息[by:wangfeng]",
+            notes = "删除任务信息")
+    @PostMapping("/clearMissionDetail")
+    @SysLogger("clearMissionDetail")
+    public RespDTO<Boolean> clearMissionDetail(@RequestBody StdMissionDetailClVO stdMissionDetailClVO) {
+        boolean res = stdMissionDetailFacade.clearMissionDetails(stdMissionDetailClVO);
+        return RespDTO.onSuc(res);
+    }
+}

+ 66 - 0
mrman-service/src/main/java/com/diagbot/web/StdMissionInfoController.java

@@ -0,0 +1,66 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.StdMissionDetailPageDTO;
+import com.diagbot.dto.StdMissionInfoPageDTO;
+import com.diagbot.facade.StdMissionDetailFacade;
+import com.diagbot.facade.StdMissionInfoFacade;
+import com.diagbot.vo.StdMissionDetailPageVO;
+import com.diagbot.vo.StdMissionInfoClearVO;
+import com.diagbot.vo.StdMissionInfoPageVO;
+import com.diagbot.vo.StdMissionInfoUpVO;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-06-12
+ */
+@RestController
+@RequestMapping("/stdMissionInfo")
+@Api(value = "任务信息相关接口", tags = { "任务信息相关接口" })
+public class StdMissionInfoController {
+    @Autowired
+    StdMissionInfoFacade stdMissionInfoFacade;
+
+    @ApiOperation(value = "分页获取任务信息[by:wangfeng]",
+            notes = "分页获取任务信息")
+    @PostMapping("/getMissionInfoPage")
+    @SysLogger("getMissionInfoPage")
+    public RespDTO<IPage<StdMissionInfoPageDTO>> getMissionInfoPage(@RequestBody StdMissionInfoPageVO stdMissionInfoPageVO) {
+        IPage<StdMissionInfoPageDTO> data = stdMissionInfoFacade.getMissionInfoPages(stdMissionInfoPageVO);
+        return RespDTO.onSuc(data);
+    }
+    @ApiOperation(value = "修改获取任务信息[by:wangfeng]",
+            notes = "修改获取任务信息")
+    @PostMapping("/updataMissionInfo")
+    @SysLogger("updataMissionInfo")
+    public RespDTO<Boolean> updataMissionInfo(@RequestBody StdMissionInfoUpVO stdMissionInfoUpVO) {
+        boolean res = stdMissionInfoFacade.updataMissionInfos(stdMissionInfoUpVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "删除任务信息[by:wangfeng]",
+            notes = "删除任务信息")
+    @PostMapping("/clearMissionInfo")
+    @SysLogger("clearMissionInfo")
+    public RespDTO<Boolean> clearMissionInfo(@RequestBody StdMissionInfoClearVO stdMissionInfoClearVO) {
+        boolean res = stdMissionInfoFacade.clearMissionInfos(stdMissionInfoClearVO);
+        return RespDTO.onSuc(res);
+    }
+
+}

+ 0 - 4
mrman-service/src/main/java/com/diagbot/web/StdQcresultDetailController.java

@@ -3,10 +3,8 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.StdQcresultDetail;
 import com.diagbot.facade.StdQcresultDetailFacade;
 import com.diagbot.vo.StdQcresultDetailVO;
-import com.diagbot.vo.SthospitalInfoUpdataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;

+ 52 - 31
mrman-service/src/main/resources/mapper/MedBehospitalInfoMapper.xml

@@ -4,37 +4,58 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedBehospitalInfo">
-        <id column="behospital_code" property="behospitalCode" />
-        <result column="hospital_id" property="hospitalId" />
-        <result column="name" property="name" />
-        <result column="sex" property="sex" />
-        <result column="birthday" property="birthday" />
-        <result column="file_code" property="fileCode" />
-        <result column="qc_type_id" property="qcTypeId" />
-        <result column="ward_code" property="wardCode" />
-        <result column="ward_name" property="wardName" />
-        <result column="beh_dept_id" property="behDeptId" />
-        <result column="beh_dept_name" property="behDeptName" />
-        <result column="bed_code" property="bedCode" />
-        <result column="bed_name" property="bedName" />
-        <result column="insurance_name" property="insuranceName" />
-        <result column="job_type" property="jobType" />
-        <result column="behospital_date" property="behospitalDate" />
-        <result column="leave_hospital_date" property="leaveHospitalDate" />
-        <result column="diagnose_icd" property="diagnoseIcd" />
-        <result column="diagnose" property="diagnose" />
-        <result column="doctor_id" property="doctorId" />
-        <result column="doctor_name" property="doctorName" />
-        <result column="beh_doctor_id" property="behDoctorId" />
-        <result column="beh_doctor_name" property="behDoctorName" />
-        <result column="director_doctor_id" property="directorDoctorId" />
-        <result column="director_doctor_name" property="directorDoctorName" />
-        <result column="is_placefile" property="isPlacefile" />
-        <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" />
+        <id column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="name" property="name"/>
+        <result column="sex" property="sex"/>
+        <result column="birthday" property="birthday"/>
+        <result column="file_code" property="fileCode"/>
+        <result column="qc_type_id" property="qcTypeId"/>
+        <result column="ward_code" property="wardCode"/>
+        <result column="ward_name" property="wardName"/>
+        <result column="beh_dept_id" property="behDeptId"/>
+        <result column="beh_dept_name" property="behDeptName"/>
+        <result column="bed_code" property="bedCode"/>
+        <result column="bed_name" property="bedName"/>
+        <result column="insurance_name" property="insuranceName"/>
+        <result column="job_type" property="jobType"/>
+        <result column="behospital_date" property="behospitalDate"/>
+        <result column="leave_hospital_date" property="leaveHospitalDate"/>
+        <result column="diagnose_icd" property="diagnoseIcd"/>
+        <result column="diagnose" property="diagnose"/>
+        <result column="doctor_id" property="doctorId"/>
+        <result column="doctor_name" property="doctorName"/>
+        <result column="beh_doctor_id" property="behDoctorId"/>
+        <result column="beh_doctor_name" property="behDoctorName"/>
+        <result column="director_doctor_id" property="directorDoctorId"/>
+        <result column="director_doctor_name" property="directorDoctorName"/>
+        <result column="is_placefile" property="isPlacefile"/>
+        <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"/>
     </resultMap>
 
+    <select id="findhospitalDept" parameterType="com.diagbot.vo.MedBehospitalDeptVO"
+            resultType="com.diagbot.dto.MedBehospitalDeptDTO">
+        SELECT
+        beh_dept_id AS deptId,
+        beh_dept_name AS deptName
+        FROM
+        std_behospital_info
+        WHERE is_deleted = "N"
+        <if test="hospitalId !=null">
+            AND hospital_id = #{hospitalId}
+        </if>
+        <if test="deptId!=null">
+            AND beh_dept_id = #{deptId}
+        </if>
+        <if test="deptName!=null and deptName!=''">
+            AND beh_dept_name LIKE CONCAT('%',#{deptName},'%')
+        </if>
+        GROUP BY beh_dept_id
+
+    </select>
+
 </mapper>

+ 80 - 1
mrman-service/src/main/resources/mapper/StdBehospitalInfoMapper.xml

@@ -65,7 +65,7 @@
         <if test="hospitalId != null">
             AND a.hospital_id = #{hospitalId}
         </if>
-        <if test="name">
+        <if test="name != null and name!= ''">
             AND a.name LIKE CONCAT('%', #{name}, '%')
         </if>
         <if test="leaveHosDateStart!=null and leaveHosDateEnd != null and leaveHosDateStart!=''and leaveHosDateEnd !='' ">
@@ -74,4 +74,83 @@
         </if>
     </select>
 
+    <select id="getStatistic" parameterType="com.diagbot.vo.SthospitalInfoStatiVO"
+            resultType="com.diagbot.dto.SthospitalInfoStatiDTO">
+        SELECT
+        t.hospital_id as hospitalId,
+        t.hospitalName,
+        t.casesId AS casesId,
+        t.cases_name as casesName,
+        t.stdMsg as msg,
+        t.code as entryCode,
+        t.name as entryName,
+        COUNT(*) AS amount,
+        SUBSTRING_INDEX(GROUP_CONCAT(t.behospital_code), ',', 5) AS behospitalCodeStr
+        FROM
+        (
+        SELECT
+        t1.behospital_code,
+        t1.code,
+        t1.NAME,
+        t1.cases_name,
+        t1.hospital_id,
+        t1.hospitalName,
+        t1.casesId,
+        t1.stdMsg,
+        t1.satisfy,
+        t1.cases_entry_id AS stdEntryId,
+        t2.cases_entry_id AS newEntryId
+        FROM
+        (
+        SELECT
+        d.NAME,
+        d.code,
+        d.cases_id AS casesId,
+        d.cases_name,
+        e.name as hospitalName,
+        c.msg AS stdMsg,
+        b.*
+        FROM
+        std_behospital_info a,
+        std_qcresult_detail b,
+        qc_cases_entry_hospital c,
+        qc_cases_entry d,
+        bas_hospital_info e
+        WHERE
+        a.is_deleted = 'N'
+        AND b.is_deleted = 'N'
+        AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
+        AND a.hospital_id = b.hospital_id
+        AND a.hospital_id = c.hospital_id
+        AND a.behospital_code = b.behospital_code
+        AND b.cases_entry_id = c.cases_entry_id
+        AND c.cases_entry_id = d.id
+        and e.id = a.hospital_id
+        <if test="hospitalId!=null">
+            AND  a.hospital_id =#{hospitalId}
+        </if>
+        <if test="casesId!= null">
+            AND d.cases_id= #{casesId}
+        </if>
+        <if test="entryCode!=null and entryCode!=''">
+            AND d.code=#{entryCode}
+        </if>
+        <if test="entryName!=null and entryName!=''">
+            AND d.name LIKE CONCAT('%',#{entryName},'%')
+        </if>
+
+        ) t1
+        LEFT JOIN med_qcresult_detail t2 ON t1.behospital_code = t2.behospital_code
+        AND t1.cases_entry_id = t2.cases_entry_id
+        AND t2.is_deleted = 'N'
+        ) t
+        WHERE
+        ( t.satisfy = 1 AND t.stdEntryId = t.newEntryId )
+        OR ( t.satisfy = 0 AND t.newEntryId IS NULL )
+        GROUP BY
+        t.stdMsg,
+        t.`NAME`
+        ORDER BY COUNT(*) DESC
+    </select>
 </mapper>

+ 62 - 0
mrman-service/src/main/resources/mapper/StdMissionDetailMapper.xml

@@ -0,0 +1,62 @@
+<?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.StdMissionDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.StdMissionDetail">
+        <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="mission_id" property="missionId" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="cases_id" property="casesId" />
+        <result column="cases_name" property="casesName" />
+        <result column="entry_code" property="entryCode" />
+        <result column="entry_name" property="entryName" />
+        <result column="amount" property="amount" />
+        <result column="behospitalCodeStr" property="behospitalCodeStr" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+    <select id="getMissionDetailPage" parameterType="com.diagbot.vo.StdMissionDetailPageVO"
+            resultType="com.diagbot.dto.StdMissionDetailPageDTO">
+        SELECT
+        a.id,
+        a.hospital_id AS hospitalId,
+        b.name AS hospitalName,
+        a.cases_id AS casesId,
+        a.cases_name AS casesName,
+        a.entry_code AS entryCode,
+        a.entry_name AS entryName,
+        a.amount AS amount,
+        a.behospitalCodeStr,
+        a.status
+        FROM
+        std_mission_detail a,
+        bas_hospital_info b
+        WHERE a.is_deleted = "N"
+        AND b.id = a.hospital_id
+        <if test="missionId!=null">
+            AND a.mission_id =#{missionId}
+        </if>
+        <if test="hospitalId!=null">
+            AND a.hospital_id = #{hospitalId}
+        </if>
+        <if test="casesId!=null">
+            AND a.cases_id =#{casesId}
+        </if>
+        <if test="entryName!=null and entryName !=''">
+            AND a.entry_name LIKE CONCAT('%',#{entryName},'%')
+        </if>
+        <if test="entryCode!=null and entryCode!=''">
+            AND a.entry_code =#{entryCode}
+        </if>
+        <if test="status!=null">
+            AND a.status = #{status}
+        </if>
+        ORDER BY amount DESC
+    </select>
+</mapper>

+ 27 - 0
mrman-service/src/main/resources/mapper/StdMissionInfoMapper.xml

@@ -0,0 +1,27 @@
+<?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.StdMissionInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.StdMissionInfo">
+        <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="mission_name" property="missionName"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <select id="getMissionInfoPages" parameterType="com.diagbot.vo.StdMissionInfoPageVO"
+            resultType="com.diagbot.dto.StdMissionInfoPageDTO">
+        SELECT id,mission_name as missionName,remark FROM std_mission_info
+        WHERE is_deleted = "N"
+        <if test="missionName!=null and missionName!=''">
+            AND mission_name LIKE CONCAT('%',#{missionName},'%')
+        </if>
+        ORDER BY gmt_modified DESC
+    </select>
+</mapper>