20210924v1.0

src/main/java/com/ccsens/carbasics/api/DoctorController.java

@@ -0,0 +1,41 @@
+package com.ccsens.carbasics.api;
+
+import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
+import com.ccsens.carbasics.service.IOrganizationMemberService;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/9/17 15:48
+ */
+@Api(tags = "医院成员" )
+@RestController
+@RequestMapping("/doctor")
+@Slf4j
+public class DoctorController {
+
+    @Resource
+    private IOrganizationMemberService organizationMemberService;
+
+    @MustLogin
+    @ApiOperation(value = "查询用户对应的医院信息", notes = "")
+    @RequestMapping(value = "/getHospital", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<OrganizationMemberVo.Organization> getHospital(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
+        OrganizationMemberVo.Organization organization = organizationMemberService.getHospital(params.getUserId());
+        return JsonResponse.newInstance().ok(organization);
+    }
+}

src/main/java/com/ccsens/carbasics/api/OcrController.java

@@ -19,12 +19,15 @@ import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.Part;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -47,8 +50,9 @@ public class OcrController {
         log.info("图像识别");
         // 压缩图像
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ImageUtil.scale(ImageIO.read(part.getInputStream()), out, 0.5f);
+        ImageUtil.scale(ImageIO.read(part.getInputStream()), out, 1f);
         String img = Base64.encode(out.toByteArray());
+
         // 图像识别
         BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic();
         basic.setImage(img);
@@ -63,10 +67,9 @@ public class OcrController {
     @MustLogin
     @ApiOperation(value = "图片文字识别",notes = "")
     @RequestMapping(value="/general/basic",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<QuestionOcrVo.GeneralBasic>> queryInpatient(@ApiParam @Validated @RequestBody QueryDto<OcrDto.GeneralBasic> params) throws Exception {
+    public JsonResponse<List<QuestionOcrVo.CodeAndAnswer>> queryInpatient(QueryDto<List<MultipartFile>> params, Long projectId) throws Exception {
-
         log.info("图片文字识别请求：{}", params);
-        List<QuestionOcrVo.GeneralBasic> words = ocrService.identifyWords(params.getParam(), params.getUserId());
+        List<QuestionOcrVo.CodeAndAnswer> words = ocrService.discernWords(params.getParam(), params.getUserId(),projectId);
         log.info("图片文字识别结束：{}", words);
         return JsonResponse.newInstance().ok(words);
     }

src/main/java/com/ccsens/carbasics/api/OrganizationController.java

@@ -1,13 +1,23 @@
 package com.ccsens.carbasics.api;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.carbasics.bean.dto.OrganizationDto;
 import com.ccsens.carbasics.bean.dto.StatisticalDto;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.bean.vo.StatisticalVo;
 import com.ccsens.carbasics.service.IOrganizationService;
+import com.ccsens.carbasics.util.Constant;
+import com.ccsens.carbasics.util.DefaultCodeError;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.util.JsonResponse;
+import com.ccsens.util.PoiUtil;
+import com.ccsens.util.PropUtil;
+import com.ccsens.util.WebConstant;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.exception.BaseException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -17,13 +27,16 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.util.Date;
 import java.util.List;
 
 /**
  * @description:
- * @author: whj
+ * @author: whjswitchProject
  * @time: 2021/9/3 16:38
  */
 @Api(tags = "机构（质控，医院）相关")
@@ -44,4 +57,34 @@ public class OrganizationController {
         log.info("山西省地市查询结果:{}", rank);
         return JsonResponse.newInstance().ok(rank);
     }
+
+    @MustLogin
+    @ApiOperation(value = "机构导入", notes = "")
+    @RequestMapping(value = "/import", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse importOrganization( QueryDto<MultipartFile> params) throws Exception {
+        MultipartFile f = params.getParam();
+        String ext = FileUtil.extName(f.getOriginalFilename());
+        if(StrUtil.isEmpty(ext) || !Constant.WbsExcel.WBS_FILE_FORMAT.contains(ext)){
+            throw new BaseException(DefaultCodeError.FILE_FORMAT_ERROR);
+        }
+        //文件路径
+        String dir = PropUtil.path + "organization/";
+        String path = DateUtil.format(new Date(), "yyyyMMdd") + File.separator + IdUtil.simpleUUID() + "." + ext;
+        String fullPath = dir + path;
+        //转成file
+        File file = new File(fullPath);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+
+        FileUtil.writeFromStream(f.getInputStream(), fullPath);
+
+        List<Object[]> rowList = PoiUtil.readExce(file, 0, null, 1, false);
+        //导入数据库
+        String result = organizationService.importCode(rowList,params.getUserId());
+        JsonResponse ok = JsonResponse.newInstance().ok();
+        ok.setMsg(StrUtil.isBlank(result) ? ok.getMsg() : result);
+        return ok;
+    }
+
 }

src/main/java/com/ccsens/carbasics/api/PatientController.java

@@ -4,6 +4,7 @@ import com.ccsens.carbasics.bean.dto.PatientDto;
 import com.ccsens.carbasics.bean.vo.PatientVo;
 import com.ccsens.carbasics.service.IFirstAidService;
 import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.CodeError;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.github.pagehelper.PageInfo;
@@ -83,6 +84,17 @@ public class PatientController {
         return JsonResponse.newInstance().ok(list);
     }
 
+    @MustLogin
+    @ApiOperation(value = "质检员上报数据状态", notes = "whj")
+    @RequestMapping(value = "/report", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse report(@ApiParam @Validated @RequestBody QueryDto<PatientDto.Report> params) throws Exception{
+        log.info("质检员上报数据状态：{}", params);
+        CodeError.Code code = firstAidService.report(params.getParam(), params.getUserId());
+        log.info("质检员上报数据状态成功");
+        return JsonResponse.newInstance().ok(code);
+    }
+
+
     @MustLogin
     @ApiOperation(value = "秘书查看审核列表", notes = "zy")
     @RequestMapping(value = "/listBySecretary", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

src/main/java/com/ccsens/carbasics/api/ProjectController.java

@@ -2,6 +2,7 @@ package com.ccsens.carbasics.api;
 
 import com.ccsens.carbasics.bean.dto.ProjectDto;
 import com.ccsens.carbasics.bean.vo.ProjectVo;
+import com.ccsens.carbasics.service.IAsyncService;
 import com.ccsens.carbasics.service.IQcpProjectService;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.common.bean.dto.CProjectDto;
@@ -9,6 +10,7 @@ import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.message.SwitchoverProjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author 逗
@@ -34,6 +38,8 @@ public class ProjectController {
     private IProjectService projectService;
     @Resource
     private IQcpProjectService qcpProjectService;
+    @Resource
+    private IAsyncService asyncService;
 
     @ApiOperation(value = "根据id查询项目信息", notes = "根据id查询项目信息")
     @RequestMapping(value = "/findProjectById", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
@@ -58,7 +64,7 @@ public class ProjectController {
     @RequestMapping(value = "/switchProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse switchProject(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.SwitchProject> params) throws Exception {
         log.info("切换项目：{}", params);
-        qcpProjectService.switchProject(params.getParam(), params.getUserId());
+        asyncService.switchProject(params);
         log.info("切换项目");
         return JsonResponse.newInstance().ok();
     }

src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java

@@ -0,0 +1,72 @@
+package com.ccsens.carbasics.api;
+
+import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
+import com.ccsens.carbasics.bean.po.Questionnaire;
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+import com.ccsens.carbasics.service.IQuestionnaireService;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.common.bean.dto.CPluginDto;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "问查调卷相关接口" , description = "")
+@RestController
+@RequestMapping("/questionnaire")
+@Slf4j
+public class QuestionnaireController {
+
+    @Resource
+    private IQuestionnaireService questionnaireService;
+
+    @MustLogin
+    @ApiOperation(value = "查询地区", notes = "")
+    @RequestMapping(value = "/area", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<QuestionnaireVo.AreaInfo>> queryPatientList(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.QueryArea> params) throws Exception{
+        log.info("查询地区开始{}",params);
+        List<QuestionnaireVo.AreaInfo> areaInfoList = questionnaireService.queryArea(params.getParam(),params.getUserId());
+        log.info("查询地区结束{}",areaInfoList);
+        return JsonResponse.newInstance().ok(areaInfoList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询问卷", notes = "")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<QuestionnaireVo.QuestionnaireInfo> queryQuestionnaire(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.QueryQuestionnaire> params) throws Exception{
+        log.info("查询问卷开始{}",params);
+        QuestionnaireVo.QuestionnaireInfo questionnaireInfo = questionnaireService.queryQuestionnaire(params.getParam(),params.getUserId());
+        log.info("查询问卷结束{}",questionnaireInfo);
+        return JsonResponse.newInstance().ok(questionnaireInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "保存调查问卷", notes = "")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveQuestionnaire(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.SaveQuestionnaire> params) throws Exception{
+        log.info("保存调查问卷开始{}",params);
+        questionnaireService.saveQuestionnaire(params.getParam(),params.getUserId());
+        log.info("保存调查问卷结束");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询医院是否填写了调查问卷", notes = "")
+    @RequestMapping(value = "/queryNotWrite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<QuestionnaireVo.WriteStatus>> queryNotWrite(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.QueryNotWrite> params) throws Exception{
+        log.info("保存调查问卷开始{}",params);
+        List<QuestionnaireVo.WriteStatus> writeStatusList = questionnaireService.queryNotWrite(params.getParam(),params.getUserId());
+        log.info("保存调查问卷结束{}",writeStatusList);
+        return JsonResponse.newInstance().ok(writeStatusList);
+    }
+}

src/main/java/com/ccsens/carbasics/api/ShareController.java

@@ -0,0 +1,50 @@
+package com.ccsens.carbasics.api;
+
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.common.bean.dto.CShareDto;
+import com.ccsens.common.bean.vo.CShareVo;
+import com.ccsens.common.service.IShareService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "分享相关")
+@RestController
+@RequestMapping("/share")
+@Slf4j
+public class ShareController {
+    @Resource
+    private IShareService shareService;
+
+    @MustLogin
+    @ApiOperation(value = "创建分享连接", notes = "")
+    @RequestMapping(value = "/create", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CShareVo.CreateShareUrl> createShareUrl(@ApiParam @Validated @RequestBody QueryDto<CShareDto.CreateShareUrl> params) {
+        log.info("创建分享连接开始:{}",params);
+        CShareVo.CreateShareUrl shareUrl = shareService.createShareUrl(params.getParam(), params.getUserId());
+        log.info("创建分享连接结束:{}",shareUrl);
+        return JsonResponse.newInstance().ok(shareUrl);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "点击分享连接", notes = "")
+    @RequestMapping(value = "/click", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CShareVo.ClickShareInfo> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CShareDto.ClickShareUrl> params) {
+        log.info("点击分享链接开始:{}",params);
+        CShareVo.ClickShareInfo clickShareInfo = shareService.clickShareUrl(params.getParam(), params.getUserId(),params.getUserName(),params.getPhone());
+        log.info("点击分享链接结束:{}",clickShareInfo);
+        return JsonResponse.newInstance().ok(clickShareInfo);
+    }
+
+}

src/main/java/com/ccsens/carbasics/api/StatisticalController.java

@@ -161,9 +161,9 @@ public class StatisticalController {
     @ApiOperation(value = "山西省地市查询", notes = "山西省地市查询")
     @RequestMapping(value = "/provinceCity", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<List<StatisticalVo.ProvinceCity>> provinceCityStatistical(@ApiParam @Validated @RequestBody QueryDto<StatisticalDto.ProvinceCode> params) {
-        log.info("各地-溶栓患者/机械再通/脑出血:{}", params);
+        log.info("山西省地市查询:{}", params);
         List<StatisticalVo.ProvinceCity> provinceCity = statisticalService.provinceCityStatistical(params.getParam(), params.getUserId());
-        log.info("各地-溶栓患者/机械再通/脑出血结果:{}", provinceCity);
+        log.info("山西省地市查询结果:{}", provinceCity);
         return JsonResponse.newInstance().ok(provinceCity);
     }
 }

src/main/java/com/ccsens/carbasics/api/UserController.java

@@ -0,0 +1,49 @@
+package com.ccsens.carbasics.api;
+
+import com.ccsens.common.bean.dto.CMemberDto;
+import com.ccsens.common.service.IMemberService;
+import com.ccsens.util.JsonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zy
+ */
+@Api(tags = "用户")
+@RestController
+@RequestMapping("/user")
+@Slf4j
+public class UserController {
+    @Resource
+    private IMemberService memberService;
+
+    @ApiOperation(value = "根据手机号更新成员的userId",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/memberWithPhone",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse memberWithPhone(@ApiParam @Validated @RequestBody CMemberDto.PhoneAndUserId params) throws Exception {
+        log.info("根据手机号更新成员userId");
+        memberService.relevancePhone(params);
+        return JsonResponse.newInstance().ok();
+    }
+
+    @ApiOperation(value = "合并用户后修改userId",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/mergeUser",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse mergeUser(@ApiParam @Validated @RequestBody CMemberDto.MergeUser params) throws Exception {
+        log.info("合并用户后修改userId");
+        memberService.mergeUser(params);
+        return JsonResponse.newInstance().ok();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/dto/OcrDto.java

@@ -6,8 +6,10 @@ import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.File;
+import java.util.List;
 
 public class OcrDto {
 
@@ -15,17 +17,11 @@ public class OcrDto {
     @Data
     public static class GeneralBasic{
         @NotNull
-        @ApiModelProperty("患者ID")
+        @ApiModelProperty("急救id")
-        private Long patientId;
+        private Long firstAidId;
-        @ApiModelProperty("报告单类型")
+        @NotEmpty
-        @NotBlank
-        private String code;
-        @ApiModelProperty("图片路径")
-        private String url;
-        @ApiModelProperty("图片ID")
-        private Long fileId;
         @ApiModelProperty("图片")
-        private MultipartFile file;
+        private List<MultipartFile> fileList;
     }
 
 }

src/main/java/com/ccsens/carbasics/bean/dto/PatientDto.java

@@ -119,7 +119,7 @@ public class PatientDto {
         @ApiModelProperty("患者姓名")
         private String name;
         @ApiModelProperty("性别 0女 1男")
-        private byte gender;
+        private Byte gender;
         @Length(max = 20,message = "名字名称过长")
         @ApiModelProperty("民族")
         private String nation;
@@ -129,7 +129,7 @@ public class PatientDto {
         @ApiModelProperty("疑似诊断信息")
         private String suspected;
         @ApiModelProperty("是否是演示数据 0正式 1演示")
-        private byte valueType;
+        private Byte valueType;
     }
 
 
@@ -144,9 +144,9 @@ public class PatientDto {
     @Data
     @ApiModel("修改急救信息")
     public static class UpdatePatient{
-        @NotNull(message = "请输入项目id")
+//        @NotNull(message = "请输入项目id")
-        @ApiModelProperty("项目id")
+//        @ApiModelProperty("项目id")
-        private Long projectId;
+//        private Long projectId;
         @NotNull(message = "请输入急救id")
         @ApiModelProperty("急救id")
         private Long firstAidId;
@@ -172,7 +172,7 @@ public class PatientDto {
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("病例状态 0:创建 1:急救审核通过  2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6:申请拒绝")
-        private byte dataStatus;
+        private Byte dataStatus;
         @ApiModelProperty("患者姓名")
         private String name;
         @ApiModelProperty("到院时间-开始")
@@ -185,6 +185,10 @@ public class PatientDto {
         @Length(max = 18,message = "请输入正确的身份证号")
         @ApiModelProperty("证件号")
         private String idcard;
+        @ApiModelProperty("查询类型，0：急救 1：出院")
+        private Byte queryType = 0;
+        @ApiModelProperty("上报情况 0:未上报 1:上报成功")
+        private Byte reported;
 
         @ApiModelProperty("第几页")
         @Min(value = 1)
@@ -205,4 +209,15 @@ public class PatientDto {
         private byte dataStatus;
     }
 
+    @Data
+    @ApiModel("质检员上报数据")
+    public static class Report{
+        @NotNull
+        @ApiModelProperty("急救id")
+        private Long firstAidId;
+        @NotNull
+        @ApiModelProperty("上报情况 0:未上报 1:上报成功")
+        private Byte reported;
+    }
+
 }

src/main/java/com/ccsens/carbasics/bean/dto/ProjectDto.java

@@ -61,6 +61,8 @@ public class ProjectDto {
     public static class SwitchProject {
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("项目访问域")
+        private String url;
     }
 
     @Data

src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java

@@ -0,0 +1,117 @@
+package com.ccsens.carbasics.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class QuestionnaireDto {
+
+    @Data
+    @ApiModel("查询地区")
+    public static class QueryArea{
+        @ApiModelProperty("地区id")
+        private Long id = 0L;
+    }
+
+    @Data
+    @ApiModel("查询问卷信息")
+    public static class QueryQuestionnaire {
+        @ApiModelProperty("当前时间")
+        private Long time = System.currentTimeMillis();
+        @NotNull(message = "请选择类型")
+        @ApiModelProperty("类型(0-卒中)")
+        private Byte type;
+    }
+
+    @Data
+    @ApiModel("保存问卷信息")
+    public static class SaveQuestionnaire {
+        @NotBlank(message = "请选择市")
+        @ApiModelProperty("市")
+        private String city;
+        @NotBlank(message = "请选择县/区")
+        @ApiModelProperty("县/区")
+        private String county;
+        @NotNull(message = "请填写医院等级")
+        @ApiModelProperty("医院等级")
+        private Byte hospitalLevel;
+        @NotBlank(message = "请填写医院名称")
+        @ApiModelProperty("医院名称")
+        private String hospitalName;
+        @NotBlank(message = "请选择部门")
+        @ApiModelProperty("部门")
+        private String departments;
+        @NotBlank(message = "请填写姓名")
+        @ApiModelProperty("姓名")
+        private String name;
+        @NotBlank(message = "请填写手机号")
+        @ApiModelProperty("手机号")
+        private String phone;
+        @NotNull(message = "是否为脑防委高级卒中中心不能为空")
+        @ApiModelProperty("是否为脑防委高级卒中中心")
+        private Byte advancedStrokeCenter;
+        @NotNull(message = "是否为脑防委卒中防治中心不能为空")
+        @ApiModelProperty("是否为脑防委卒中防治中心")
+        private Byte strokeCenter;
+        @NotNull(message = "是否为山西省溶栓2.0版地图医院不能为空")
+        @ApiModelProperty("是否为山西省溶栓2.0版地图医院")
+        private Byte mapHospital;
+        @NotNull(message = "收治急性缺血性卒中例数不能为空")
+        @ApiModelProperty("收治急性缺血性卒中例数")
+        private Integer strokeNumber;
+        @NotNull(message = "4.5小时内到院AIS例数不能为空")
+        @ApiModelProperty("4.5小时内到院AIS例数")
+        private Integer aisNumberFour;
+        @NotNull(message = "4.5小时内静脉溶栓治疗例数不能为空")
+        @ApiModelProperty("4.5小时内静脉溶栓治疗例数")
+        private Integer jmrsNumberFour;
+        @NotNull(message = "应用rtPA溶栓例数不能为空")
+        @ApiModelProperty("应用rtPA溶栓例数")
+        private Integer rtpaNumber;
+        @NotNull(message = "DNT＜45min例数不能为空")
+        @ApiModelProperty("DNT＜45min例数")
+        private Integer dntNumber;
+        @NotNull(message = "45min＜DNT＜60min例数不能为空")
+        @ApiModelProperty("45min＜DNT＜60min例数")
+        private Integer dntNumberFour;
+        @NotNull(message = "DNT＞60min例数不能为空")
+        @ApiModelProperty("DNT＞60min例数")
+        private Integer dntNumberSix;
+        @NotNull(message = "溶栓后sICH例数不能为空")
+        @ApiModelProperty("溶栓后sICH例数")
+        private Integer sichNumber;
+        @NotNull(message = "溶栓后90天mRS 0-1分患者数不能为空")
+        @ApiModelProperty("溶栓后90天mRS 0-1分患者数(包括电话随访)")
+        private Integer jmrsNumberOne;
+        @ApiModelProperty("4.5-6小时到院AIS患者数(有血管内治疗指征)")
+        private Integer aisNumberSix;
+        @ApiModelProperty("发病6h到院患者桥接+直接取栓总例数")
+        private Integer shouldDirectly;
+        @ApiModelProperty("DPT中位数")
+        private Integer dptMedianNumber;
+        @ApiModelProperty("PRT中位数")
+        private Integer prtMedianNumber;
+        @ApiModelProperty("术后90天mRS 0-2分患者数(包括电话随访)")
+        private Integer jmrsNumberTwo;
+        @ApiModelProperty("术后90天死亡患者数(包括电话随访)")
+        private Integer deathNumber;
+        @ApiModelProperty("问卷id")
+        private Long questionnaireId;
+        @ApiModelProperty("类型")
+        private Byte type;
+    }
+
+    @Data
+    @ApiModel("查询是否填写")
+    public static class QueryNotWrite {
+        @NotNull(message = "项目id不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("时间")
+        private Long time = System.currentTimeMillis();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/dto/StatisticalDto.java

@@ -135,7 +135,7 @@ public class StatisticalDto {
     public static class AreaMedian {
         @NotNull(message = "请选择对应的省份信息")
         @ApiModelProperty("省质控code")
-        private String code;
+        private String code = "SZK";
         @ApiModelProperty("开始时间")
         private Long startTime;
         @NotNull

src/main/java/com/ccsens/carbasics/bean/po/Area.java

@@ -0,0 +1,150 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Area implements Serializable {
+    private Integer id;
+
+    private String areaName;
+
+    private String areaCode;
+
+    private String areaShort;
+
+    private Byte areaStatus;
+
+    private Integer areaParentId;
+
+    private Date initDate;
+
+    private String initAddr;
+
+    private Byte areaType;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName == null ? null : areaName.trim();
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode == null ? null : areaCode.trim();
+    }
+
+    public String getAreaShort() {
+        return areaShort;
+    }
+
+    public void setAreaShort(String areaShort) {
+        this.areaShort = areaShort == null ? null : areaShort.trim();
+    }
+
+    public Byte getAreaStatus() {
+        return areaStatus;
+    }
+
+    public void setAreaStatus(Byte areaStatus) {
+        this.areaStatus = areaStatus;
+    }
+
+    public Integer getAreaParentId() {
+        return areaParentId;
+    }
+
+    public void setAreaParentId(Integer areaParentId) {
+        this.areaParentId = areaParentId;
+    }
+
+    public Date getInitDate() {
+        return initDate;
+    }
+
+    public void setInitDate(Date initDate) {
+        this.initDate = initDate;
+    }
+
+    public String getInitAddr() {
+        return initAddr;
+    }
+
+    public void setInitAddr(String initAddr) {
+        this.initAddr = initAddr == null ? null : initAddr.trim();
+    }
+
+    public Byte getAreaType() {
+        return areaType;
+    }
+
+    public void setAreaType(Byte areaType) {
+        this.areaType = areaType;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", areaName=").append(areaName);
+        sb.append(", areaCode=").append(areaCode);
+        sb.append(", areaShort=").append(areaShort);
+        sb.append(", areaStatus=").append(areaStatus);
+        sb.append(", areaParentId=").append(areaParentId);
+        sb.append(", initDate=").append(initDate);
+        sb.append(", initAddr=").append(initAddr);
+        sb.append(", areaType=").append(areaType);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/AreaExample.java

@@ -0,0 +1,961 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AreaExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public AreaExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameIsNull() {
+            addCriterion("area_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameIsNotNull() {
+            addCriterion("area_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameEqualTo(String value) {
+            addCriterion("area_name =", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameNotEqualTo(String value) {
+            addCriterion("area_name <>", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameGreaterThan(String value) {
+            addCriterion("area_name >", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameGreaterThanOrEqualTo(String value) {
+            addCriterion("area_name >=", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameLessThan(String value) {
+            addCriterion("area_name <", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameLessThanOrEqualTo(String value) {
+            addCriterion("area_name <=", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameLike(String value) {
+            addCriterion("area_name like", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameNotLike(String value) {
+            addCriterion("area_name not like", value, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameIn(List<String> values) {
+            addCriterion("area_name in", values, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameNotIn(List<String> values) {
+            addCriterion("area_name not in", values, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameBetween(String value1, String value2) {
+            addCriterion("area_name between", value1, value2, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNameNotBetween(String value1, String value2) {
+            addCriterion("area_name not between", value1, value2, "areaName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeIsNull() {
+            addCriterion("area_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeIsNotNull() {
+            addCriterion("area_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeEqualTo(String value) {
+            addCriterion("area_code =", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeNotEqualTo(String value) {
+            addCriterion("area_code <>", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeGreaterThan(String value) {
+            addCriterion("area_code >", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("area_code >=", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeLessThan(String value) {
+            addCriterion("area_code <", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeLessThanOrEqualTo(String value) {
+            addCriterion("area_code <=", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeLike(String value) {
+            addCriterion("area_code like", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeNotLike(String value) {
+            addCriterion("area_code not like", value, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeIn(List<String> values) {
+            addCriterion("area_code in", values, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeNotIn(List<String> values) {
+            addCriterion("area_code not in", values, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeBetween(String value1, String value2) {
+            addCriterion("area_code between", value1, value2, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaCodeNotBetween(String value1, String value2) {
+            addCriterion("area_code not between", value1, value2, "areaCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortIsNull() {
+            addCriterion("area_short is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortIsNotNull() {
+            addCriterion("area_short is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortEqualTo(String value) {
+            addCriterion("area_short =", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortNotEqualTo(String value) {
+            addCriterion("area_short <>", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortGreaterThan(String value) {
+            addCriterion("area_short >", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortGreaterThanOrEqualTo(String value) {
+            addCriterion("area_short >=", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortLessThan(String value) {
+            addCriterion("area_short <", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortLessThanOrEqualTo(String value) {
+            addCriterion("area_short <=", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortLike(String value) {
+            addCriterion("area_short like", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortNotLike(String value) {
+            addCriterion("area_short not like", value, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortIn(List<String> values) {
+            addCriterion("area_short in", values, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortNotIn(List<String> values) {
+            addCriterion("area_short not in", values, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortBetween(String value1, String value2) {
+            addCriterion("area_short between", value1, value2, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaShortNotBetween(String value1, String value2) {
+            addCriterion("area_short not between", value1, value2, "areaShort");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusIsNull() {
+            addCriterion("area_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusIsNotNull() {
+            addCriterion("area_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusEqualTo(Byte value) {
+            addCriterion("area_status =", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusNotEqualTo(Byte value) {
+            addCriterion("area_status <>", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusGreaterThan(Byte value) {
+            addCriterion("area_status >", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("area_status >=", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusLessThan(Byte value) {
+            addCriterion("area_status <", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("area_status <=", value, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusIn(List<Byte> values) {
+            addCriterion("area_status in", values, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusNotIn(List<Byte> values) {
+            addCriterion("area_status not in", values, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusBetween(Byte value1, Byte value2) {
+            addCriterion("area_status between", value1, value2, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("area_status not between", value1, value2, "areaStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdIsNull() {
+            addCriterion("area_parent_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdIsNotNull() {
+            addCriterion("area_parent_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdEqualTo(Integer value) {
+            addCriterion("area_parent_id =", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdNotEqualTo(Integer value) {
+            addCriterion("area_parent_id <>", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdGreaterThan(Integer value) {
+            addCriterion("area_parent_id >", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("area_parent_id >=", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdLessThan(Integer value) {
+            addCriterion("area_parent_id <", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdLessThanOrEqualTo(Integer value) {
+            addCriterion("area_parent_id <=", value, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdIn(List<Integer> values) {
+            addCriterion("area_parent_id in", values, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdNotIn(List<Integer> values) {
+            addCriterion("area_parent_id not in", values, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdBetween(Integer value1, Integer value2) {
+            addCriterion("area_parent_id between", value1, value2, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaParentIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("area_parent_id not between", value1, value2, "areaParentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateIsNull() {
+            addCriterion("init_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateIsNotNull() {
+            addCriterion("init_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateEqualTo(Date value) {
+            addCriterion("init_date =", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateNotEqualTo(Date value) {
+            addCriterion("init_date <>", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateGreaterThan(Date value) {
+            addCriterion("init_date >", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("init_date >=", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateLessThan(Date value) {
+            addCriterion("init_date <", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateLessThanOrEqualTo(Date value) {
+            addCriterion("init_date <=", value, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateIn(List<Date> values) {
+            addCriterion("init_date in", values, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateNotIn(List<Date> values) {
+            addCriterion("init_date not in", values, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateBetween(Date value1, Date value2) {
+            addCriterion("init_date between", value1, value2, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitDateNotBetween(Date value1, Date value2) {
+            addCriterion("init_date not between", value1, value2, "initDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrIsNull() {
+            addCriterion("init_addr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrIsNotNull() {
+            addCriterion("init_addr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrEqualTo(String value) {
+            addCriterion("init_addr =", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrNotEqualTo(String value) {
+            addCriterion("init_addr <>", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrGreaterThan(String value) {
+            addCriterion("init_addr >", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrGreaterThanOrEqualTo(String value) {
+            addCriterion("init_addr >=", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrLessThan(String value) {
+            addCriterion("init_addr <", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrLessThanOrEqualTo(String value) {
+            addCriterion("init_addr <=", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrLike(String value) {
+            addCriterion("init_addr like", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrNotLike(String value) {
+            addCriterion("init_addr not like", value, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrIn(List<String> values) {
+            addCriterion("init_addr in", values, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrNotIn(List<String> values) {
+            addCriterion("init_addr not in", values, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrBetween(String value1, String value2) {
+            addCriterion("init_addr between", value1, value2, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andInitAddrNotBetween(String value1, String value2) {
+            addCriterion("init_addr not between", value1, value2, "initAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeIsNull() {
+            addCriterion("area_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeIsNotNull() {
+            addCriterion("area_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeEqualTo(Byte value) {
+            addCriterion("area_type =", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeNotEqualTo(Byte value) {
+            addCriterion("area_type <>", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeGreaterThan(Byte value) {
+            addCriterion("area_type >", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("area_type >=", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeLessThan(Byte value) {
+            addCriterion("area_type <", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("area_type <=", value, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeIn(List<Byte> values) {
+            addCriterion("area_type in", values, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeNotIn(List<Byte> values) {
+            addCriterion("area_type not in", values, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeBetween(Byte value1, Byte value2) {
+            addCriterion("area_type between", value1, value2, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("area_type not between", value1, value2, "areaType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/FirstAid.java

@@ -30,6 +30,8 @@ public class FirstAid implements Serializable {
 
     private Long hospitalId;
 
+    private Byte reported;
+
     private Long operator;
 
     private Date createdAt;
@@ -144,6 +146,14 @@ public class FirstAid implements Serializable {
         this.hospitalId = hospitalId;
     }
 
+    public Byte getReported() {
+        return reported;
+    }
+
+    public void setReported(Byte reported) {
+        this.reported = reported;
+    }
+
     public Long getOperator() {
         return operator;
     }
@@ -195,6 +205,7 @@ public class FirstAid implements Serializable {
         sb.append(", dataStatus=").append(dataStatus);
         sb.append(", projectId=").append(projectId);
         sb.append(", hospitalId=").append(hospitalId);
+        sb.append(", reported=").append(reported);
         sb.append(", operator=").append(operator);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);

src/main/java/com/ccsens/carbasics/bean/po/FirstAidExample.java

@@ -925,6 +925,66 @@ public class FirstAidExample {
             return (Criteria) this;
         }
 
+        public Criteria andReportedIsNull() {
+            addCriterion("reported is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedIsNotNull() {
+            addCriterion("reported is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedEqualTo(Byte value) {
+            addCriterion("reported =", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedNotEqualTo(Byte value) {
+            addCriterion("reported <>", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedGreaterThan(Byte value) {
+            addCriterion("reported >", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedGreaterThanOrEqualTo(Byte value) {
+            addCriterion("reported >=", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedLessThan(Byte value) {
+            addCriterion("reported <", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedLessThanOrEqualTo(Byte value) {
+            addCriterion("reported <=", value, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedIn(List<Byte> values) {
+            addCriterion("reported in", values, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedNotIn(List<Byte> values) {
+            addCriterion("reported not in", values, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedBetween(Byte value1, Byte value2) {
+            addCriterion("reported between", value1, value2, "reported");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportedNotBetween(Byte value1, Byte value2) {
+            addCriterion("reported not between", value1, value2, "reported");
+            return (Criteria) this;
+        }
+
         public Criteria andOperatorIsNull() {
             addCriterion("operator is null");
             return (Criteria) this;

src/main/java/com/ccsens/carbasics/bean/po/OcrKeyword.java

@@ -0,0 +1,139 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class OcrKeyword implements Serializable {
+    private Long id;
+
+    private String code;
+
+    private String option;
+
+    private String keyword;
+
+    private String keywordExclude;
+
+    private Byte verifyType;
+
+    private String queryRule;
+
+    private Long organizationId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getOption() {
+        return option;
+    }
+
+    public void setOption(String option) {
+        this.option = option == null ? null : option.trim();
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword == null ? null : keyword.trim();
+    }
+
+    public String getKeywordExclude() {
+        return keywordExclude;
+    }
+
+    public void setKeywordExclude(String keywordExclude) {
+        this.keywordExclude = keywordExclude == null ? null : keywordExclude.trim();
+    }
+
+    public Byte getVerifyType() {
+        return verifyType;
+    }
+
+    public void setVerifyType(Byte verifyType) {
+        this.verifyType = verifyType;
+    }
+
+    public String getQueryRule() {
+        return queryRule;
+    }
+
+    public void setQueryRule(String queryRule) {
+        this.queryRule = queryRule == null ? null : queryRule.trim();
+    }
+
+    public Long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(Long organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", option=").append(option);
+        sb.append(", keyword=").append(keyword);
+        sb.append(", keywordExclude=").append(keywordExclude);
+        sb.append(", verifyType=").append(verifyType);
+        sb.append(", queryRule=").append(queryRule);
+        sb.append(", organizationId=").append(organizationId);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/OcrKeywordExample.java

@@ -0,0 +1,911 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OcrKeywordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public OcrKeywordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionIsNull() {
+            addCriterion("option is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionIsNotNull() {
+            addCriterion("option is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionEqualTo(String value) {
+            addCriterion("option =", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionNotEqualTo(String value) {
+            addCriterion("option <>", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionGreaterThan(String value) {
+            addCriterion("option >", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionGreaterThanOrEqualTo(String value) {
+            addCriterion("option >=", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionLessThan(String value) {
+            addCriterion("option <", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionLessThanOrEqualTo(String value) {
+            addCriterion("option <=", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionLike(String value) {
+            addCriterion("option like", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionNotLike(String value) {
+            addCriterion("option not like", value, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionIn(List<String> values) {
+            addCriterion("option in", values, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionNotIn(List<String> values) {
+            addCriterion("option not in", values, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionBetween(String value1, String value2) {
+            addCriterion("option between", value1, value2, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andOptionNotBetween(String value1, String value2) {
+            addCriterion("option not between", value1, value2, "option");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIsNull() {
+            addCriterion("keyword is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIsNotNull() {
+            addCriterion("keyword is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordEqualTo(String value) {
+            addCriterion("keyword =", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordNotEqualTo(String value) {
+            addCriterion("keyword <>", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordGreaterThan(String value) {
+            addCriterion("keyword >", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordGreaterThanOrEqualTo(String value) {
+            addCriterion("keyword >=", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordLessThan(String value) {
+            addCriterion("keyword <", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordLessThanOrEqualTo(String value) {
+            addCriterion("keyword <=", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordLike(String value) {
+            addCriterion("keyword like", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordNotLike(String value) {
+            addCriterion("keyword not like", value, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIn(List<String> values) {
+            addCriterion("keyword in", values, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordNotIn(List<String> values) {
+            addCriterion("keyword not in", values, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordBetween(String value1, String value2) {
+            addCriterion("keyword between", value1, value2, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordNotBetween(String value1, String value2) {
+            addCriterion("keyword not between", value1, value2, "keyword");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeIsNull() {
+            addCriterion("keyword_exclude is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeIsNotNull() {
+            addCriterion("keyword_exclude is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeEqualTo(String value) {
+            addCriterion("keyword_exclude =", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeNotEqualTo(String value) {
+            addCriterion("keyword_exclude <>", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeGreaterThan(String value) {
+            addCriterion("keyword_exclude >", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeGreaterThanOrEqualTo(String value) {
+            addCriterion("keyword_exclude >=", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeLessThan(String value) {
+            addCriterion("keyword_exclude <", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeLessThanOrEqualTo(String value) {
+            addCriterion("keyword_exclude <=", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeLike(String value) {
+            addCriterion("keyword_exclude like", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeNotLike(String value) {
+            addCriterion("keyword_exclude not like", value, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeIn(List<String> values) {
+            addCriterion("keyword_exclude in", values, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeNotIn(List<String> values) {
+            addCriterion("keyword_exclude not in", values, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeBetween(String value1, String value2) {
+            addCriterion("keyword_exclude between", value1, value2, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordExcludeNotBetween(String value1, String value2) {
+            addCriterion("keyword_exclude not between", value1, value2, "keywordExclude");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeIsNull() {
+            addCriterion("verify_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeIsNotNull() {
+            addCriterion("verify_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeEqualTo(Byte value) {
+            addCriterion("verify_type =", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeNotEqualTo(Byte value) {
+            addCriterion("verify_type <>", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeGreaterThan(Byte value) {
+            addCriterion("verify_type >", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("verify_type >=", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeLessThan(Byte value) {
+            addCriterion("verify_type <", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("verify_type <=", value, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeIn(List<Byte> values) {
+            addCriterion("verify_type in", values, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeNotIn(List<Byte> values) {
+            addCriterion("verify_type not in", values, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeBetween(Byte value1, Byte value2) {
+            addCriterion("verify_type between", value1, value2, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerifyTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("verify_type not between", value1, value2, "verifyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleIsNull() {
+            addCriterion("query_rule is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleIsNotNull() {
+            addCriterion("query_rule is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleEqualTo(String value) {
+            addCriterion("query_rule =", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleNotEqualTo(String value) {
+            addCriterion("query_rule <>", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleGreaterThan(String value) {
+            addCriterion("query_rule >", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleGreaterThanOrEqualTo(String value) {
+            addCriterion("query_rule >=", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleLessThan(String value) {
+            addCriterion("query_rule <", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleLessThanOrEqualTo(String value) {
+            addCriterion("query_rule <=", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleLike(String value) {
+            addCriterion("query_rule like", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleNotLike(String value) {
+            addCriterion("query_rule not like", value, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleIn(List<String> values) {
+            addCriterion("query_rule in", values, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleNotIn(List<String> values) {
+            addCriterion("query_rule not in", values, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleBetween(String value1, String value2) {
+            addCriterion("query_rule between", value1, value2, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andQueryRuleNotBetween(String value1, String value2) {
+            addCriterion("query_rule not between", value1, value2, "queryRule");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdEqualTo(Long value) {
+            addCriterion("organization_id =", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotEqualTo(Long value) {
+            addCriterion("organization_id <>", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThan(Long value) {
+            addCriterion("organization_id >", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("organization_id >=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThan(Long value) {
+            addCriterion("organization_id <", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThanOrEqualTo(Long value) {
+            addCriterion("organization_id <=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIn(List<Long> values) {
+            addCriterion("organization_id in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotIn(List<Long> values) {
+            addCriterion("organization_id not in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdBetween(Long value1, Long value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotBetween(Long value1, Long value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/OcrKeywordOption.java

@@ -0,0 +1,95 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class OcrKeywordOption implements Serializable {
+    private Long id;
+
+    private String code;
+
+    private String answer;
+
+    private Long keywordId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer == null ? null : answer.trim();
+    }
+
+    public Long getKeywordId() {
+        return keywordId;
+    }
+
+    public void setKeywordId(Long keywordId) {
+        this.keywordId = keywordId;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", answer=").append(answer);
+        sb.append(", keywordId=").append(keywordId);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/OcrKeywordOptionExample.java

@@ -0,0 +1,641 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OcrKeywordOptionExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public OcrKeywordOptionExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerIsNull() {
+            addCriterion("answer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerIsNotNull() {
+            addCriterion("answer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerEqualTo(String value) {
+            addCriterion("answer =", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerNotEqualTo(String value) {
+            addCriterion("answer <>", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerGreaterThan(String value) {
+            addCriterion("answer >", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerGreaterThanOrEqualTo(String value) {
+            addCriterion("answer >=", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerLessThan(String value) {
+            addCriterion("answer <", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerLessThanOrEqualTo(String value) {
+            addCriterion("answer <=", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerLike(String value) {
+            addCriterion("answer like", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerNotLike(String value) {
+            addCriterion("answer not like", value, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerIn(List<String> values) {
+            addCriterion("answer in", values, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerNotIn(List<String> values) {
+            addCriterion("answer not in", values, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerBetween(String value1, String value2) {
+            addCriterion("answer between", value1, value2, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andAnswerNotBetween(String value1, String value2) {
+            addCriterion("answer not between", value1, value2, "answer");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdIsNull() {
+            addCriterion("keyword_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdIsNotNull() {
+            addCriterion("keyword_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdEqualTo(Long value) {
+            addCriterion("keyword_id =", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdNotEqualTo(Long value) {
+            addCriterion("keyword_id <>", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdGreaterThan(Long value) {
+            addCriterion("keyword_id >", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("keyword_id >=", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdLessThan(Long value) {
+            addCriterion("keyword_id <", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdLessThanOrEqualTo(Long value) {
+            addCriterion("keyword_id <=", value, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdIn(List<Long> values) {
+            addCriterion("keyword_id in", values, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdNotIn(List<Long> values) {
+            addCriterion("keyword_id not in", values, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdBetween(Long value1, Long value2) {
+            addCriterion("keyword_id between", value1, value2, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeywordIdNotBetween(Long value1, Long value2) {
+            addCriterion("keyword_id not between", value1, value2, "keywordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/Questionnaire.java

@@ -0,0 +1,128 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Questionnaire implements Serializable {
+    private Long id;
+
+    private String questionnaireName;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    private Byte type;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private Long writeStartTime;
+
+    private Long writeEndTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getQuestionnaireName() {
+        return questionnaireName;
+    }
+
+    public void setQuestionnaireName(String questionnaireName) {
+        this.questionnaireName = questionnaireName == null ? null : questionnaireName.trim();
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    public Long getWriteStartTime() {
+        return writeStartTime;
+    }
+
+    public void setWriteStartTime(Long writeStartTime) {
+        this.writeStartTime = writeStartTime;
+    }
+
+    public Long getWriteEndTime() {
+        return writeEndTime;
+    }
+
+    public void setWriteEndTime(Long writeEndTime) {
+        this.writeEndTime = writeEndTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", questionnaireName=").append(questionnaireName);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", type=").append(type);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append(", writeStartTime=").append(writeStartTime);
+        sb.append(", writeEndTime=").append(writeEndTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/QuestionnaireDetail.java

@@ -0,0 +1,359 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class QuestionnaireDetail implements Serializable {
+    private Long id;
+
+    private String city;
+
+    private String county;
+
+    private Byte hospitalLevel;
+
+    private String hospitalName;
+
+    private String departments;
+
+    private String name;
+
+    private String phone;
+
+    private Byte advancedStrokeCenter;
+
+    private Byte strokeCenter;
+
+    private Byte mapHospital;
+
+    private Integer strokeNumber;
+
+    private Integer aisNumberFour;
+
+    private Integer jmrsNumberFour;
+
+    private Integer rtpaNumber;
+
+    private Integer dntNumber;
+
+    private Integer dntNumberFour;
+
+    private Integer dntNumberSix;
+
+    private Integer sichNumber;
+
+    private Integer jmrsNumberOne;
+
+    private Integer aisNumberSix;
+
+    private Integer shouldDirectly;
+
+    private Integer dptMedianNumber;
+
+    private Integer prtMedianNumber;
+
+    private Integer jmrsNumberTwo;
+
+    private Integer deathNumber;
+
+    private Long userId;
+
+    private Long questionnaireId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city == null ? null : city.trim();
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county == null ? null : county.trim();
+    }
+
+    public Byte getHospitalLevel() {
+        return hospitalLevel;
+    }
+
+    public void setHospitalLevel(Byte hospitalLevel) {
+        this.hospitalLevel = hospitalLevel;
+    }
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName == null ? null : hospitalName.trim();
+    }
+
+    public String getDepartments() {
+        return departments;
+    }
+
+    public void setDepartments(String departments) {
+        this.departments = departments == null ? null : departments.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public Byte getAdvancedStrokeCenter() {
+        return advancedStrokeCenter;
+    }
+
+    public void setAdvancedStrokeCenter(Byte advancedStrokeCenter) {
+        this.advancedStrokeCenter = advancedStrokeCenter;
+    }
+
+    public Byte getStrokeCenter() {
+        return strokeCenter;
+    }
+
+    public void setStrokeCenter(Byte strokeCenter) {
+        this.strokeCenter = strokeCenter;
+    }
+
+    public Byte getMapHospital() {
+        return mapHospital;
+    }
+
+    public void setMapHospital(Byte mapHospital) {
+        this.mapHospital = mapHospital;
+    }
+
+    public Integer getStrokeNumber() {
+        return strokeNumber;
+    }
+
+    public void setStrokeNumber(Integer strokeNumber) {
+        this.strokeNumber = strokeNumber;
+    }
+
+    public Integer getAisNumberFour() {
+        return aisNumberFour;
+    }
+
+    public void setAisNumberFour(Integer aisNumberFour) {
+        this.aisNumberFour = aisNumberFour;
+    }
+
+    public Integer getJmrsNumberFour() {
+        return jmrsNumberFour;
+    }
+
+    public void setJmrsNumberFour(Integer jmrsNumberFour) {
+        this.jmrsNumberFour = jmrsNumberFour;
+    }
+
+    public Integer getRtpaNumber() {
+        return rtpaNumber;
+    }
+
+    public void setRtpaNumber(Integer rtpaNumber) {
+        this.rtpaNumber = rtpaNumber;
+    }
+
+    public Integer getDntNumber() {
+        return dntNumber;
+    }
+
+    public void setDntNumber(Integer dntNumber) {
+        this.dntNumber = dntNumber;
+    }
+
+    public Integer getDntNumberFour() {
+        return dntNumberFour;
+    }
+
+    public void setDntNumberFour(Integer dntNumberFour) {
+        this.dntNumberFour = dntNumberFour;
+    }
+
+    public Integer getDntNumberSix() {
+        return dntNumberSix;
+    }
+
+    public void setDntNumberSix(Integer dntNumberSix) {
+        this.dntNumberSix = dntNumberSix;
+    }
+
+    public Integer getSichNumber() {
+        return sichNumber;
+    }
+
+    public void setSichNumber(Integer sichNumber) {
+        this.sichNumber = sichNumber;
+    }
+
+    public Integer getJmrsNumberOne() {
+        return jmrsNumberOne;
+    }
+
+    public void setJmrsNumberOne(Integer jmrsNumberOne) {
+        this.jmrsNumberOne = jmrsNumberOne;
+    }
+
+    public Integer getAisNumberSix() {
+        return aisNumberSix;
+    }
+
+    public void setAisNumberSix(Integer aisNumberSix) {
+        this.aisNumberSix = aisNumberSix;
+    }
+
+    public Integer getShouldDirectly() {
+        return shouldDirectly;
+    }
+
+    public void setShouldDirectly(Integer shouldDirectly) {
+        this.shouldDirectly = shouldDirectly;
+    }
+
+    public Integer getDptMedianNumber() {
+        return dptMedianNumber;
+    }
+
+    public void setDptMedianNumber(Integer dptMedianNumber) {
+        this.dptMedianNumber = dptMedianNumber;
+    }
+
+    public Integer getPrtMedianNumber() {
+        return prtMedianNumber;
+    }
+
+    public void setPrtMedianNumber(Integer prtMedianNumber) {
+        this.prtMedianNumber = prtMedianNumber;
+    }
+
+    public Integer getJmrsNumberTwo() {
+        return jmrsNumberTwo;
+    }
+
+    public void setJmrsNumberTwo(Integer jmrsNumberTwo) {
+        this.jmrsNumberTwo = jmrsNumberTwo;
+    }
+
+    public Integer getDeathNumber() {
+        return deathNumber;
+    }
+
+    public void setDeathNumber(Integer deathNumber) {
+        this.deathNumber = deathNumber;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getQuestionnaireId() {
+        return questionnaireId;
+    }
+
+    public void setQuestionnaireId(Long questionnaireId) {
+        this.questionnaireId = questionnaireId;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", city=").append(city);
+        sb.append(", county=").append(county);
+        sb.append(", hospitalLevel=").append(hospitalLevel);
+        sb.append(", hospitalName=").append(hospitalName);
+        sb.append(", departments=").append(departments);
+        sb.append(", name=").append(name);
+        sb.append(", phone=").append(phone);
+        sb.append(", advancedStrokeCenter=").append(advancedStrokeCenter);
+        sb.append(", strokeCenter=").append(strokeCenter);
+        sb.append(", mapHospital=").append(mapHospital);
+        sb.append(", strokeNumber=").append(strokeNumber);
+        sb.append(", aisNumberFour=").append(aisNumberFour);
+        sb.append(", jmrsNumberFour=").append(jmrsNumberFour);
+        sb.append(", rtpaNumber=").append(rtpaNumber);
+        sb.append(", dntNumber=").append(dntNumber);
+        sb.append(", dntNumberFour=").append(dntNumberFour);
+        sb.append(", dntNumberSix=").append(dntNumberSix);
+        sb.append(", sichNumber=").append(sichNumber);
+        sb.append(", jmrsNumberOne=").append(jmrsNumberOne);
+        sb.append(", aisNumberSix=").append(aisNumberSix);
+        sb.append(", shouldDirectly=").append(shouldDirectly);
+        sb.append(", dptMedianNumber=").append(dptMedianNumber);
+        sb.append(", prtMedianNumber=").append(prtMedianNumber);
+        sb.append(", jmrsNumberTwo=").append(jmrsNumberTwo);
+        sb.append(", deathNumber=").append(deathNumber);
+        sb.append(", userId=").append(userId);
+        sb.append(", questionnaireId=").append(questionnaireId);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/QuestionnaireExample.java

@@ -0,0 +1,811 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class QuestionnaireExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public QuestionnaireExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameIsNull() {
+            addCriterion("questionnaire_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameIsNotNull() {
+            addCriterion("questionnaire_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameEqualTo(String value) {
+            addCriterion("questionnaire_name =", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameNotEqualTo(String value) {
+            addCriterion("questionnaire_name <>", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameGreaterThan(String value) {
+            addCriterion("questionnaire_name >", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameGreaterThanOrEqualTo(String value) {
+            addCriterion("questionnaire_name >=", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameLessThan(String value) {
+            addCriterion("questionnaire_name <", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameLessThanOrEqualTo(String value) {
+            addCriterion("questionnaire_name <=", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameLike(String value) {
+            addCriterion("questionnaire_name like", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameNotLike(String value) {
+            addCriterion("questionnaire_name not like", value, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameIn(List<String> values) {
+            addCriterion("questionnaire_name in", values, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameNotIn(List<String> values) {
+            addCriterion("questionnaire_name not in", values, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameBetween(String value1, String value2) {
+            addCriterion("questionnaire_name between", value1, value2, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuestionnaireNameNotBetween(String value1, String value2) {
+            addCriterion("questionnaire_name not between", value1, value2, "questionnaireName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNull() {
+            addCriterion("start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNotNull() {
+            addCriterion("start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeEqualTo(Long value) {
+            addCriterion("start_time =", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotEqualTo(Long value) {
+            addCriterion("start_time <>", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThan(Long value) {
+            addCriterion("start_time >", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("start_time >=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThan(Long value) {
+            addCriterion("start_time <", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThanOrEqualTo(Long value) {
+            addCriterion("start_time <=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIn(List<Long> values) {
+            addCriterion("start_time in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotIn(List<Long> values) {
+            addCriterion("start_time not in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeBetween(Long value1, Long value2) {
+            addCriterion("start_time between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotBetween(Long value1, Long value2) {
+            addCriterion("start_time not between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Long value) {
+            addCriterion("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Long value) {
+            addCriterion("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Long value) {
+            addCriterion("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Long value) {
+            addCriterion("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Long value) {
+            addCriterion("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Long> values) {
+            addCriterion("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Long> values) {
+            addCriterion("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Long value1, Long value2) {
+            addCriterion("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Long value1, Long value2) {
+            addCriterion("end_time not between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeIsNull() {
+            addCriterion("write_start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeIsNotNull() {
+            addCriterion("write_start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeEqualTo(Long value) {
+            addCriterion("write_start_time =", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeNotEqualTo(Long value) {
+            addCriterion("write_start_time <>", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeGreaterThan(Long value) {
+            addCriterion("write_start_time >", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("write_start_time >=", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeLessThan(Long value) {
+            addCriterion("write_start_time <", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeLessThanOrEqualTo(Long value) {
+            addCriterion("write_start_time <=", value, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeIn(List<Long> values) {
+            addCriterion("write_start_time in", values, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeNotIn(List<Long> values) {
+            addCriterion("write_start_time not in", values, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeBetween(Long value1, Long value2) {
+            addCriterion("write_start_time between", value1, value2, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteStartTimeNotBetween(Long value1, Long value2) {
+            addCriterion("write_start_time not between", value1, value2, "writeStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeIsNull() {
+            addCriterion("write_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeIsNotNull() {
+            addCriterion("write_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeEqualTo(Long value) {
+            addCriterion("write_end_time =", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeNotEqualTo(Long value) {
+            addCriterion("write_end_time <>", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeGreaterThan(Long value) {
+            addCriterion("write_end_time >", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("write_end_time >=", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeLessThan(Long value) {
+            addCriterion("write_end_time <", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeLessThanOrEqualTo(Long value) {
+            addCriterion("write_end_time <=", value, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeIn(List<Long> values) {
+            addCriterion("write_end_time in", values, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeNotIn(List<Long> values) {
+            addCriterion("write_end_time not in", values, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeBetween(Long value1, Long value2) {
+            addCriterion("write_end_time between", value1, value2, "writeEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWriteEndTimeNotBetween(Long value1, Long value2) {
+            addCriterion("write_end_time not between", value1, value2, "writeEndTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/bean/vo/FirstAidLogVo.java

@@ -28,8 +28,17 @@ public class FirstAidLogVo {
         @ApiModelProperty("日志ID")
         private Long id;
         @ApiModelProperty("角色 0:分诊护士 1:神内医生 2:神外医生")
-        private byte role;
+        private Byte role;
         @ApiModelProperty("医生名字")
         private String name;
+        @ApiModelProperty("是否是当前的医生 -1：非医生 0:参与过的医生 1：当前医生 ")
+        private Byte currentDoctor;
+
+        public Byte getCurrentDoctor() {
+            if (role != null && role == 0) {
+                currentDoctor = -1;
+            }
+            return currentDoctor;
+        }
     }
 }

src/main/java/com/ccsens/carbasics/bean/vo/OcrVo.java

@@ -2,6 +2,7 @@ package com.ccsens.carbasics.bean.vo;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdcardUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.util.baidu.BaiDuVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,11 +20,11 @@ public class OcrVo {
         @ApiModelProperty("姓名")
         private String name;
         @ApiModelProperty("性别")
-        private byte sex;
+        private Byte sex;
         @ApiModelProperty("身份证号")
         private String idCardNo;
         @ApiModelProperty("年龄")
-        private int age;
+        private Integer age;
         @ApiModelProperty("民族")
         private String nation;
 
@@ -37,14 +38,27 @@ public class OcrVo {
             words.forEach(wordNode ->{
                 String word = wordNode.getWords();
                 if (word.startsWith(idCardName)) {
-                    this.name = word.substring(2);
+                    this.name = word.substring(idCardName.length());
                 } else if (word.startsWith(idCardSex)) {
-                    String sexWord = word.substring(2,3);
+                    int sexIndex = 2;
-                    this.sex = "女".equals(sexWord) ? (byte)0 : (byte)1;
+                    if (word.length() > sexIndex) {
-                    this.nation = word.substring(5);
+                        String sexWord = word.substring(sexIndex,sexIndex +1);
+                        this.sex = "女".equals(sexWord) ? (byte)0 : (byte)1;
+                    }
+                    int nationIndex = 5;
+                    if (word.length() > nationIndex) {
+                        this.nation = word.substring(nationIndex);
+                    }
+
                 } else if (word.startsWith(idCardNo)) {
-                    this.idCardNo = word.substring(6);
+                    int idCardIndex = 6;
-                    this.age = IdcardUtil.getAgeByIdCard(this.idCardNo);
+                    int idCardMinLength = 15;
+                    if (word.length() > idCardIndex) {
+                        this.idCardNo = word.substring(6);
+                    }
+                    if (StrUtil.isNotBlank(this.idCardNo) && this.idCardNo.length() >= idCardMinLength) {
+                        this.age = IdcardUtil.getAgeByIdCard(this.idCardNo);
+                    }
                 }
             });
         }

src/main/java/com/ccsens/carbasics/bean/vo/OrganizationMemberVo.java

@@ -0,0 +1,24 @@
+package com.ccsens.carbasics.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/9/17 15:55
+ */
+public class OrganizationMemberVo {
+
+    @ApiModel("医院-返回")
+    @Data
+    public static class Organization{
+        @ApiModelProperty("医院ID")
+        private Long id;
+        @ApiModelProperty("医院名字")
+        private String name;
+        @ApiModelProperty("项目ID")
+        private Long projectId;
+    }
+}

src/main/java/com/ccsens/carbasics/bean/vo/PatientVo.java

@@ -33,15 +33,15 @@ public class PatientVo {
         @ApiModelProperty("名称")
         private String name;
         @ApiModelProperty("性别")
-        private byte gender;
+        private Byte gender;
         @ApiModelProperty("年龄")
-        private int age;
+        private Integer age;
         @ApiModelProperty("平车id")
         private Long carId;
         @ApiModelProperty("是否是演示数据 0否 1是")
-        private byte demonstrate;
+        private Byte demonstrate;
         @ApiModelProperty("病例状态 0:创建 1:急救审核通过  2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6:申请拒绝")
-        private byte dataStatus;
+        private Byte dataStatus;
         @ApiModelProperty("急救:发病时间 转归：出院时间")
         private String record1;
         @ApiModelProperty("急救:到院时间 转归:离院方式")
@@ -126,11 +126,18 @@ public class PatientVo {
         @ApiModelProperty("患者姓名")
         private String name;
         @ApiModelProperty("性别 0女 1男")
-        private byte gender;
+        private Byte gender;
         @ApiModelProperty("民族")
         private String nation;
         @ApiModelProperty("证件号")
         private String idcard;
+        @ApiModelProperty("疑似诊断信息")
+        private String suspected;
+        @ApiModelProperty("项目ID")
+        private Long projectId;
+        @ApiModelProperty("年龄")
+        private Integer age;
+
     }
 
     @Data
@@ -141,25 +148,28 @@ public class PatientVo {
         @ApiModelProperty("患者姓名")
         private String name;
         @ApiModelProperty("性别 0女 1男")
-        private byte gender;
+        private Byte gender;
         @ApiModelProperty("年龄")
-        private int age;
+        private Integer age;
         @ApiModelProperty("民族")
         private String nation;
         @ApiModelProperty("证件号")
         private String idcard;
         @ApiModelProperty("审核状态  0:创建 1:急救审核通过  2:急救审核拒绝 3出院审核通过 4出院审核拒绝 5:申请修改 6:申请拒绝 100:审核通过已修改 101：申请拒绝无机会")
-        private int dataStatus;
+        private Integer dataStatus;
         @ApiModelProperty("类型 0：神内 1：神外")
-        private byte type;
+        private Byte type;
         @ApiModelProperty("住院号")
         private String hospitalNumber;
         @ApiModelProperty("到院时间")
         private Long arriveHospitalTime;
         //修改次数
         @JsonIgnore
-        private int times;
+        private Integer times;
-
+        @ApiModelProperty("项目ID")
+        private Long projectId;
+        @ApiModelProperty("上报情况 0:未上报 1:上报成功")
+        private Byte reported;
         public int getDataStatus() {
             if(dataStatus == Constant.DataStatus.FirstAidPass.status && times >= Constant.MAX_UPDATE_NUMBER){
                 return 100;

src/main/java/com/ccsens/carbasics/bean/vo/QuestionOcrVo.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.bean.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,4 +39,18 @@ public class QuestionOcrVo {
         @ApiModelProperty("结束标识")
         private String end;
     }
+
+    @ApiModel("报告单图片文字通用识别-返回")
+    @Data
+    public static class CodeAndAnswer{
+        @ApiModelProperty("code")
+        private String code;
+        @ApiModelProperty("答案")
+        private String answer;
+        @ApiModelProperty("是否通过验证(0否,1是)")
+        private Byte isOk;
+        @JsonIgnore
+        @ApiModelProperty("匹配中的文字")
+        private String matchStr;
+    }
 }

src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java

@@ -0,0 +1,67 @@
+package com.ccsens.carbasics.bean.vo;
+
+import com.ccsens.carbasics.bean.po.QuestionnaireDetail;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class QuestionnaireVo {
+    @Data
+    @ApiModel("地区信息")
+    public static class AreaInfo{
+        @ApiModelProperty("地区id")
+        private Long id;
+        @ApiModelProperty("地区名称")
+        private String name;
+        @ApiModelProperty("子地区")
+        private List<AreaInfo> child;
+    }
+
+    @Data
+    @ApiModel("问卷信息")
+    public static class QuestionnaireInfo {
+        @ApiModelProperty("问卷id")
+        private Long id;
+        @ApiModelProperty("问卷名称")
+        private String questionnaireName;
+        @ApiModelProperty("开始时间")
+        private Long start;
+        @ApiModelProperty("结束时间")
+        private Long end;
+        @ApiModelProperty("类型(0-卒中)")
+        private Byte type;
+        @ApiModelProperty("详情")
+        private QuestionnaireDetail detail;
+    }
+
+    @Data
+    @ApiModel("填写问卷状态")
+    public static class WriteStatus {
+        @ApiModelProperty("问卷id")
+        private Long id;
+        @ApiModelProperty("问卷名称")
+        private String questionnaireName;
+        @ApiModelProperty("问卷类型(0-卒中)")
+        private Byte type;
+        @ApiModelProperty("是否填写(0-否,1-是)")
+        private Byte isWrite;
+        @JsonIgnore
+        @ApiModelProperty("详情id")
+        private String detailId;
+        @ApiModelProperty("问卷开始时间")
+        private Long start;
+        @ApiModelProperty("问卷结束时间")
+        private Long end;
+        @ApiModelProperty("填写开始时间")
+        private Long writeStartTime;
+        @ApiModelProperty("填写结束时间")
+        private Long writeEndTime;
+
+    }
+
+}

src/main/java/com/ccsens/carbasics/persist/dao/AreaDao.java

@@ -0,0 +1,20 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+import com.ccsens.carbasics.persist.mapper.AreaMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AreaDao extends AreaMapper {
+
+    /**
+     * 根据父id查询地区信息
+     * @param id 父id
+     * @return  地区列表
+     */
+    List<QuestionnaireVo.AreaInfo> queryByParentId(@Param("id") Long id);
+}

src/main/java/com/ccsens/carbasics/persist/dao/FirstAidDao.java

@@ -1,16 +1,13 @@
 package com.ccsens.carbasics.persist.dao;
 
 import com.ccsens.carbasics.bean.dto.PatientDto;
-import com.ccsens.carbasics.bean.dto.StatisticalDto;
 import com.ccsens.carbasics.bean.po.FirstAid;
 import com.ccsens.carbasics.bean.po.Organization;
 import com.ccsens.carbasics.bean.vo.PatientVo;
-import com.ccsens.carbasics.bean.vo.StatisticalVo;
 import com.ccsens.carbasics.persist.mapper.FirstAidMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -28,11 +25,13 @@ public interface FirstAidDao extends FirstAidMapper {
 
     /**
      * 质检员查看急救列表
+     *
+     * @param templates 模板列表
      * @param hospitalId 医院id
      * @param param 筛选条件
      * @return 返回急救信息
      */
-    List<PatientVo.PatientListByQuality> queryPatientListByQuality(@Param("template")byte template,@Param("hospitalId")Long hospitalId, @Param("param")PatientDto.QueryListByQuality param);
+    List<PatientVo.PatientListByQuality> queryPatientListByQuality(@Param("templates") List<Byte> templates, @Param("hospitalId")Long hospitalId, @Param("param")PatientDto.QueryListByQuality param);
 
     /**
      * 秘书查看急救列表
@@ -50,4 +49,10 @@ public interface FirstAidDao extends FirstAidMapper {
      */
     List<PatientVo.QueryPatientList> querySelf(@Param("param") PatientDto.QueryPatient param, @Param("userId") Long userId);
 
+    /**
+     * 根据项目id查询急救信息
+     * @param projectId 项目id
+     * @return 急救信息
+     */
+    FirstAid queryByProjectId(@Param("projectId") Long projectId);
 }

src/main/java/com/ccsens/carbasics/persist/dao/FirstAidRecordDao.java

@@ -162,4 +162,11 @@ public interface FirstAidRecordDao extends FirstAidRecordMapper {
      * @return 返回质控信息
      */
     List<StatisticalVo.ProvinceCity> provinceCityStatistical(@Param("code")String code);
+
+    /**
+     * 查询发病时间
+     * @param firstAidId 急救id
+     * @return 发病时间戳
+     */
+    Long queryDiseaseTime(@Param("firstAidId") Long firstAidId);
 }

src/main/java/com/ccsens/carbasics/persist/dao/OcrKeywordDao.java

@@ -0,0 +1,25 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.po.OcrKeyword;
+import com.ccsens.carbasics.persist.mapper.OcrKeywordMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OcrKeywordDao extends OcrKeywordMapper {
+    /**
+     * 根据医院id查询所有关键词
+     * @param hospitalId 医院id
+     * @return 关键词列表
+     */
+    List<OcrKeyword> queryByHospital(@Param("hospitalId") Long hospitalId);
+
+    /**
+     * 查询出院时间
+     * @param hospitalId    医院id
+     * @return  出院时间关键词信息
+     */
+    OcrKeyword queryDischargeTime(@Param("hospitalId") Long hospitalId);
+}

src/main/java/com/ccsens/carbasics/persist/dao/OcrKeywordOptionDao.java

@@ -0,0 +1,18 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.po.OcrKeywordOption;
+import com.ccsens.carbasics.persist.mapper.OcrKeywordOptionMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OcrKeywordOptionDao extends OcrKeywordOptionMapper {
+
+    /**
+     * 根据关键字id查询选项
+     * @param keyId 关键字id
+     * @return 选项列表
+     */
+    List<OcrKeywordOption> queryByKeyId(Long keyId);
+}

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.carbasics.persist.dao;
 
 import com.ccsens.carbasics.bean.po.Organization;
+import com.ccsens.carbasics.bean.po.OrganizationParent;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.persist.mapper.OrganizationMapper;
 import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,22 @@ public interface OrganizationDao extends OrganizationMapper {
     List<OrganizationVo.RankItem> rankByDntMedian(@Param("areaId") Long areaId, @Param("level")byte level);
 
 
+    /**
+     * 根据机构名查找唯一的机构
+     * @param name 机构名
+     * @return 机构
+     */
+    Organization getOrganizationByName(@Param("name") String name);
+
+    /**
+     * 批量添加机构
+     * @param organizations 机构
+     */
+    void batchInsert(@Param("organizations") List<Organization> organizations);
+
+    /**
+     * 批量添加机构上级
+     * @param parents 机构上级
+     */
+    void batchInsertParent(@Param("parents") List<OrganizationParent> parents);
 }

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationMemberDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.persist.dao;
 
+import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.persist.mapper.OrganizationMemberMapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,9 +13,15 @@ import org.springframework.stereotype.Repository;
 public interface OrganizationMemberDao extends OrganizationMemberMapper {
     /**
      * 通过userId查找成员的科室和部门信息
-     * @param userId
+     * @param userId 用户ID
-     * @return
+     * @return 科室和部门信息
      */
     OrganizationVo.MemberPosition getMemberPosition(@Param("userId") Long userId);
 
+    /**
+     * 查询用户对应的医院信息
+     * @param userId 用户ID
+     * @return 医院信息
+     */
+    OrganizationMemberVo.Organization getHospital(@Param("userId") Long userId);
 }

src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireDao.java

@@ -0,0 +1,39 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+import com.ccsens.carbasics.persist.mapper.QuestionnaireMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface QuestionnaireDao extends QuestionnaireMapper {
+
+    /**
+     * 查询问卷信息
+     * @param time 当前时间
+     * @param type 问卷类型
+     * @param userId 用户id
+     * @return 问卷信息
+     */
+    QuestionnaireVo.QuestionnaireInfo queryQuestionnaire(@Param("time") Long time,@Param("type") Byte type,@Param("userId") Long userId);
+
+    /**
+     * 查询医院是否填写问卷调查
+     * @param name 医院名称
+     * @param time 当前时间
+     * @return 问卷调查列表
+     */
+    List<QuestionnaireVo.WriteStatus> queryNotWrite(@Param("name") String name,@Param("time") Long time);
+
+    /**
+     * 查询医院是否重复提交
+     * @param hospitalName 医院名称
+     * @param time 当前时间
+     * @param type
+     * @return 数据
+     */
+    QuestionnaireVo.QuestionnaireInfo queryRepeat(@Param("name") String hospitalName,@Param("time") Long time,@Param("type") Byte type);
+}

src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireDetailDao.java

@@ -0,0 +1,8 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.persist.mapper.QuestionnaireDetailMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface QuestionnaireDetailDao extends QuestionnaireDetailMapper {
+}

src/main/java/com/ccsens/carbasics/persist/mapper/AreaMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.Area;
+import com.ccsens.carbasics.bean.po.AreaExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AreaMapper {
+    long countByExample(AreaExample example);
+
+    int deleteByExample(AreaExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(Area record);
+
+    int insertSelective(Area record);
+
+    List<Area> selectByExample(AreaExample example);
+
+    Area selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") Area record, @Param("example") AreaExample example);
+
+    int updateByExample(@Param("record") Area record, @Param("example") AreaExample example);
+
+    int updateByPrimaryKeySelective(Area record);
+
+    int updateByPrimaryKey(Area record);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/OcrKeywordMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.OcrKeyword;
+import com.ccsens.carbasics.bean.po.OcrKeywordExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OcrKeywordMapper {
+    long countByExample(OcrKeywordExample example);
+
+    int deleteByExample(OcrKeywordExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(OcrKeyword record);
+
+    int insertSelective(OcrKeyword record);
+
+    List<OcrKeyword> selectByExample(OcrKeywordExample example);
+
+    OcrKeyword selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") OcrKeyword record, @Param("example") OcrKeywordExample example);
+
+    int updateByExample(@Param("record") OcrKeyword record, @Param("example") OcrKeywordExample example);
+
+    int updateByPrimaryKeySelective(OcrKeyword record);
+
+    int updateByPrimaryKey(OcrKeyword record);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/OcrKeywordOptionMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.OcrKeywordOption;
+import com.ccsens.carbasics.bean.po.OcrKeywordOptionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OcrKeywordOptionMapper {
+    long countByExample(OcrKeywordOptionExample example);
+
+    int deleteByExample(OcrKeywordOptionExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(OcrKeywordOption record);
+
+    int insertSelective(OcrKeywordOption record);
+
+    List<OcrKeywordOption> selectByExample(OcrKeywordOptionExample example);
+
+    OcrKeywordOption selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") OcrKeywordOption record, @Param("example") OcrKeywordOptionExample example);
+
+    int updateByExample(@Param("record") OcrKeywordOption record, @Param("example") OcrKeywordOptionExample example);
+
+    int updateByPrimaryKeySelective(OcrKeywordOption record);
+
+    int updateByPrimaryKey(OcrKeywordOption record);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/QuestionnaireDetailMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.QuestionnaireDetail;
+import com.ccsens.carbasics.bean.po.QuestionnaireDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface QuestionnaireDetailMapper {
+    long countByExample(QuestionnaireDetailExample example);
+
+    int deleteByExample(QuestionnaireDetailExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(QuestionnaireDetail record);
+
+    int insertSelective(QuestionnaireDetail record);
+
+    List<QuestionnaireDetail> selectByExample(QuestionnaireDetailExample example);
+
+    QuestionnaireDetail selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") QuestionnaireDetail record, @Param("example") QuestionnaireDetailExample example);
+
+    int updateByExample(@Param("record") QuestionnaireDetail record, @Param("example") QuestionnaireDetailExample example);
+
+    int updateByPrimaryKeySelective(QuestionnaireDetail record);
+
+    int updateByPrimaryKey(QuestionnaireDetail record);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/QuestionnaireMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.Questionnaire;
+import com.ccsens.carbasics.bean.po.QuestionnaireExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface QuestionnaireMapper {
+    long countByExample(QuestionnaireExample example);
+
+    int deleteByExample(QuestionnaireExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Questionnaire record);
+
+    int insertSelective(Questionnaire record);
+
+    List<Questionnaire> selectByExample(QuestionnaireExample example);
+
+    Questionnaire selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Questionnaire record, @Param("example") QuestionnaireExample example);
+
+    int updateByExample(@Param("record") Questionnaire record, @Param("example") QuestionnaireExample example);
+
+    int updateByPrimaryKeySelective(Questionnaire record);
+
+    int updateByPrimaryKey(Questionnaire record);
+}

src/main/java/com/ccsens/carbasics/service/AsyncService.java

@@ -0,0 +1,35 @@
+package com.ccsens.carbasics.service;
+
+import com.ccsens.carbasics.bean.dto.ProjectDto;
+import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.message.SwitchoverProjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/9/9 15:37
+ */
+@Slf4j
+@Service
+@Async
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class AsyncService implements IAsyncService {
+    @Override
+    public void switchProject(QueryDto<ProjectDto.SwitchProject> params) throws Exception {
+        log.info("开始接受切换项目");
+        Thread.sleep(1000);
+        log.info("切换项目");
+        Set<String> userIds = new HashSet<>();
+        userIds.add(params.getUserId().toString());
+        ProjectDto.SwitchProject param = params.getParam();
+        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId(), param.getUrl());
+    }
+}

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -13,23 +13,21 @@ import com.ccsens.carbasics.bean.vo.FirstAidLogVo;
 import com.ccsens.carbasics.bean.vo.FirstAidVo;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.bean.vo.PatientVo;
-import com.ccsens.carbasics.persist.dao.FirstAidDao;
+import com.ccsens.carbasics.persist.dao.*;
-import com.ccsens.carbasics.persist.dao.FirstAidLogDao;
 
-import com.ccsens.carbasics.persist.dao.FirstAidMemberDao;
-import com.ccsens.carbasics.persist.dao.OrganizationDao;
-import com.ccsens.carbasics.persist.dao.OrganizationMemberDao;
 import com.ccsens.carbasics.persist.mapper.*;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.carbasics.util.DefaultCodeError;
 import com.ccsens.common.bean.dto.CProjectDto;
 import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
+import com.ccsens.util.CodeError;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,6 +65,8 @@ public class FirstAidService implements IFirstAidService{
     @Resource
     private FirstAidRecordLogMapper firstAidRecordLogMapper;
     @Resource
+    private PatientDao patientDao;
+    @Resource
     private RedisUtil redisUtil;
 
 
@@ -213,7 +213,19 @@ public class FirstAidService implements IFirstAidService{
             getPatient.setGender(firstAids.get(0).getGender());
             getPatient.setNation(firstAids.get(0).getNation());
             getPatient.setIdcard(firstAids.get(0).getIdcard());
+            getPatient.setProjectId(firstAids.get(0).getProjectId());
+            getPatient.setAge(firstAids.get(0).getAge());
+            // 查找疑似病例
+            FirstAidRecordExample recordExample = new FirstAidRecordExample();
+            recordExample.createCriteria().andFirstAidIdEqualTo(firstAids.get(0).getId()).andQuestionCodeEqualTo(Constant.QuestionCode.CJBL_YSBL);
+            recordExample.setOrderByClause("id desc limit 1");
+            List<FirstAidRecord> firstAidRecords = firstAidRecordMapper.selectByExample(recordExample);
+            if (CollectionUtil.isNotEmpty(firstAidRecords)) {
+                getPatient.setSuspected(firstAidRecords.get(0).getAnswer());
+            }
+
         }
+
         return getPatient;
     }
 
@@ -281,10 +293,10 @@ public class FirstAidService implements IFirstAidService{
     @Override
     public PageInfo<PatientVo.PatientListByQuality> queryPatientListByQuality(PatientDto.QueryListByQuality param, Long userId) {
         //根据项目id查找医院id
-        FirstAid firstAid = firstAidDao.getIdByProjectId(param.getProjectId());
+//        FirstAid firstAid = firstAidDao.getIdByProjectId(param.getProjectId());
-        if(ObjectUtil.isNull(firstAid) || ObjectUtil.isNull(firstAid.getHospitalId())){
+//        if(ObjectUtil.isNull(firstAid) || ObjectUtil.isNull(firstAid.getHospitalId())){
-            throw new BaseException(DefaultCodeError.NOT_HOSPITAL_ID);
+//            throw new BaseException(DefaultCodeError.NOT_HOSPITAL_ID);
-        }
+//        }
         //查找当前用户的职位和科室
         OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
         //用户的科室必须是医院的科室
@@ -299,9 +311,13 @@ public class FirstAidService implements IFirstAidService{
         if(CollectionUtil.isEmpty(templateList)){
             throw new BaseException(DefaultCodeError.NOT_TEMPLATE);
         }
+        List<Byte> templates = new ArrayList<>();
+        templateList.forEach(template -> {
+            templates.add(template.getTemplate());
+        });
         //查找病例信息
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
-        List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListByQuality(templateList.get(0).getTemplate(),firstAid.getHospitalId(),param);
+        List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListByQuality(templates,organization.getId(),param);
         return new PageInfo<>(patientList);
     }
 
@@ -587,4 +603,32 @@ public class FirstAidService implements IFirstAidService{
         detail.setValueType(firstAid.getValueType());
         return detail;
     }
+
+    @Override
+    public CodeError.Code report(PatientDto.Report param, Long userId) {
+
+        FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId());
+        log.info("急救：{}", firstAid);
+        if (firstAid == null) {
+            return DefaultCodeError.NOT_FIRST_AID_ID;
+        }
+        if (firstAid.getReported() != null && firstAid.getReported().byteValue() == param.getReported()) {
+            return DefaultCodeError.DATA_STATUS_SAME;
+        }
+        // 修改上报状态
+        FirstAid newFirstAid = new FirstAid();
+        newFirstAid.setId(param.getFirstAidId());
+        newFirstAid.setReported(param.getReported());
+        firstAidDao.updateByPrimaryKeySelective(newFirstAid);
+        // 添加日志
+        FirstAidLog log = new FirstAidLog();
+        log.setId(snowflake.nextId());
+        log.setFirstAidId(param.getFirstAidId());
+        log.setOperationTime(System.currentTimeMillis());
+        log.setOperationUserId(userId);
+        log.setOperationType(Constant.FirstAidLogType.ReportedSuccess.status);
+        log.setOperationRole((byte)3);
+        firstAidLogDao.insertSelective(log);
+        return DefaultCodeError.SUCCESS;
+    }
 }

src/main/java/com/ccsens/carbasics/service/IAsyncService.java

@@ -0,0 +1,11 @@
+package com.ccsens.carbasics.service;
+
+import com.ccsens.carbasics.bean.dto.ProjectDto;
+import com.ccsens.util.bean.dto.QueryDto;
+
+public interface IAsyncService {
+    /**
+     * 通知TALL切换项目
+     * */
+    void switchProject(QueryDto<ProjectDto.SwitchProject> params) throws Exception;
+}

src/main/java/com/ccsens/carbasics/service/IFirstAidService.java

@@ -5,6 +5,7 @@ import com.ccsens.carbasics.bean.dto.FirstAidDto;
 import com.ccsens.carbasics.bean.dto.PatientDto;
 import com.ccsens.carbasics.bean.vo.FirstAidVo;
 import com.ccsens.carbasics.bean.vo.PatientVo;
+import com.ccsens.util.CodeError;
 import com.github.pagehelper.PageInfo;
 
 public interface IFirstAidService {
@@ -92,4 +93,12 @@ public interface IFirstAidService {
      * @return 病例信息
      */
     FirstAidVo.FirstAidBase getDetail(FirstAidDto.Project param, Long userId);
+
+    /**
+     * 修改急救上报状态
+     * @param param 上报信息
+     * @param userId 操作者ID
+     * @return 成功与否
+     */
+    CodeError.Code report(PatientDto.Report param, Long userId);
 }

src/main/java/com/ccsens/carbasics/service/IOcrService.java

@@ -3,8 +3,11 @@ package com.ccsens.carbasics.service;
 import com.ccsens.carbasics.bean.dto.OcrDto;
 import com.ccsens.carbasics.bean.vo.OcrVo;
 import com.ccsens.carbasics.bean.vo.QuestionOcrVo;
+import org.springframework.web.multipart.MultipartFile;
+
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -19,4 +22,14 @@ public interface IOcrService {
      * @return 文字列表
      */
     List<QuestionOcrVo.GeneralBasic> identifyWords(OcrDto.GeneralBasic param, Long userId) throws IOException;
+
+
+    /**
+     *
+     * @param param 图片地址
+     * @param userId 用户id
+     * @return 文字列表
+     * @throws IOException 异常
+     */
+    List<QuestionOcrVo.CodeAndAnswer> discernWords(List<MultipartFile> param, Long userId, Long firstAidId) throws IOException, ParseException;
 }

src/main/java/com/ccsens/carbasics/service/IOrganizationMemberService.java

@@ -0,0 +1,16 @@
+package com.ccsens.carbasics.service;
+
+
+import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
+
+/**
+ * @author whj
+ */
+public interface IOrganizationMemberService {
+    /**
+     * 查询用户对应的医院信息
+     * @param userId 用户ID
+     * @return 医院ID
+     */
+    OrganizationMemberVo.Organization getHospital(Long userId);
+}

src/main/java/com/ccsens/carbasics/service/IOrganizationService.java

@@ -3,6 +3,8 @@ package com.ccsens.carbasics.service;
 import com.ccsens.carbasics.bean.dto.OrganizationDto;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 
+import java.util.List;
+
 public interface IOrganizationService {
 
     /**
@@ -12,4 +14,12 @@ public interface IOrganizationService {
      * @return 医院排名
      */
     OrganizationVo.Rank rank(OrganizationDto.Rank param, Long userId);
+
+    /**
+     * 导入机构信息
+     * @param fullPath 文件路径
+     * @param userId 用户ID
+     * @return
+     */
+    String importCode(List<Object[]> fullPath, Long userId) throws Exception;
 }

src/main/java/com/ccsens/carbasics/service/IQcpProjectService.java

@@ -23,5 +23,5 @@ public interface IQcpProjectService {
      * @param param 项目id
      * @param userId 当前用户id
      */
-    void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception;
+//    void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception;
 }

src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java

@@ -0,0 +1,40 @@
+package com.ccsens.carbasics.service;
+
+
+import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+
+import java.util.List;
+
+public interface IQuestionnaireService {
+    /**
+     * 三级联动查询地区
+     * @param param 地区id
+     * @param userId 用户id
+     * @return  地区信息列表
+     */
+    List<QuestionnaireVo.AreaInfo> queryArea(QuestionnaireDto.QueryArea param, Long userId);
+
+    /**
+     * 查询问卷信息
+     * @param param  时间/类型/医院名称
+     * @param userId 用户id
+     * @return 问卷信息
+     */
+    QuestionnaireVo.QuestionnaireInfo queryQuestionnaire(QuestionnaireDto.QueryQuestionnaire param, Long userId);
+
+    /**
+     * 保存问卷调查信息
+     * @param param 参数
+     * @param userId 用户id
+     */
+    void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId);
+
+    /**
+     * 查询当前医院问卷是否填写
+     * @param param 项目id/当前时间
+     * @param userId 用户id
+     * @return 问卷状态列表
+     */
+    List<QuestionnaireVo.WriteStatus> queryNotWrite(QuestionnaireDto.QueryNotWrite param, Long userId);
+}

src/main/java/com/ccsens/carbasics/service/OcrService.java

@@ -2,23 +2,35 @@ package com.ccsens.carbasics.service;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ImageUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.cloudapi.sdk.model.ApiResponse;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ccsens.carbasics.bean.dto.OcrDto;
+import com.ccsens.carbasics.bean.po.FirstAid;
+import com.ccsens.carbasics.bean.po.FirstAidRecord;
+import com.ccsens.carbasics.bean.po.OcrKeyword;
+import com.ccsens.carbasics.bean.po.OcrKeywordOption;
 import com.ccsens.carbasics.bean.vo.OcrVo;
 import com.ccsens.carbasics.bean.vo.QuestionOcrVo;
-import com.ccsens.carbasics.persist.dao.QuestionOcrDao;
+import com.ccsens.carbasics.persist.dao.*;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.util.CodeEnum;
+import com.ccsens.util.PoiUtil;
+import com.ccsens.util.PropUtil;
+import com.ccsens.util.WebConstant;
 import com.ccsens.util.ali.AliInstanceUtil;
 import com.ccsens.util.baidu.BaiDuDto;
 import com.ccsens.util.baidu.BaiDuUtil;
 import com.ccsens.util.baidu.BaiDuVo;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,13 +38,13 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
-import java.io.ByteArrayOutputStream;
+import java.io.*;
-import java.io.File;
+import java.text.ParseException;
-import java.io.IOException;
+import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
+import java.util.regex.Matcher;
-import java.util.List;
+import java.util.regex.Pattern;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -41,101 +53,109 @@ public class OcrService implements IOcrService {
 
     @Resource
     private QuestionOcrDao questionOcrDao;
+    @Resource
+    private OcrKeywordDao ocrKeywordDao;
+    @Resource
+    private FirstAidDao firstAidDao;
+    @Resource
+    private FirstAidRecordDao firstAidRecordDao;
+    @Resource
+    private OcrKeywordOptionDao keywordOptionDao;
 
     @Override
     public List<QuestionOcrVo.GeneralBasic> identifyWords(OcrDto.GeneralBasic generalBasic, Long userId) throws IOException {
-        long time1 = System.currentTimeMillis();
+//        long time1 = System.currentTimeMillis();
-        List<QuestionOcrVo.GeneralBasic> vos = new ArrayList<>();
+//        List<QuestionOcrVo.GeneralBasic> vos = new ArrayList<>();
-        // 类型测评规则
+//        // 类型测评规则
-        List<QuestionOcrVo.OcrRule> rules = questionOcrDao.queryRules(generalBasic.getPatientId(), generalBasic.getCode());
+//        List<QuestionOcrVo.OcrRule> rules = questionOcrDao.queryRules(generalBasic.getPatientId(), generalBasic.getCode());
-        log.info("规则：{}", rules);
+//        log.info("规则：{}", rules);
-        if (CollectionUtil.isEmpty(rules)) {
+//        if (CollectionUtil.isEmpty(rules)) {
-            return vos;
+//            return vos;
-        }
-        long time2 = System.currentTimeMillis();
-        log.info("查询规则时间：{}", time2 - time1);
-//        ReportOcrExample ocrExample = new ReportOcrExample();
-//        ocrExample.createCriteria().andCodeEqualTo(generalBasic.getCode());
-//        List<ReportOcr> reportOcrList = reportOcrMapper.selectByExample(ocrExample);
-        long time3 = System.currentTimeMillis();
-        log.info("查询reportOrc:{}", time3 - time2);
-
-//        boolean baidu = CollectionUtil.isEmpty(reportOcrList) || reportOcrList.get(0).getOcrChannel() != 1;
-
-        // 识别字符串
-        List<String> contents = new ArrayList<>();
-        long time4 = 0;
-
-        //图片
-//        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(generalBasic.getFileId());
-//        if (commonFile == null) {
-//            throw new BaseException(CodeEnum.PARAM_ERROR);
 //        }
-//        File file = new File(commonFile.getLocation());
+//        long time2 = System.currentTimeMillis();
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+//        log.info("查询规则时间：{}", time2 - time1);
-        ImageUtil.scale(ImageIO.read((File)generalBasic.getFile()), out, 0.5f);
+////        ReportOcrExample ocrExample = new ReportOcrExample();
-//        Img.from(new URL(generalBasic.getUrl())).scale(0.5f).write(out);
+////        ocrExample.createCriteria().andCodeEqualTo(generalBasic.getCode());
-        String img = Base64.encode(out.toByteArray());
+////        List<ReportOcr> reportOcrList = reportOcrMapper.selectByExample(ocrExample);
-
+//        long time3 = System.currentTimeMillis();
-//        if (baidu) {
+//        log.info("查询reportOrc:{}", time3 - time2);
-        BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic();
+//
-//            basic.setUrl(generalBasic.getUrl());
+////        boolean baidu = CollectionUtil.isEmpty(reportOcrList) || reportOcrList.get(0).getOcrChannel() != 1;
-        basic.setImage(img);
+//
-        BaiDuVo.GeneralBasic words = BaiDuUtil.accurateBasic(Constant.BaiDu.APP_KEY, Constant.BaiDu.SECRET_KEY, basic);
+//        // 识别字符串
-        log.info("文字识别:{}", words);
+//        List<String> contents = new ArrayList<>();
-        if (words == null || CollectionUtil.isEmpty(words.getWordsResult())) {
+//        long time4 = 0;
-            return vos;
+//
-        }
+//        //图片
-        words.getWordsResult().forEach(word -> contents.add(word.getWords()));
+////        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(generalBasic.getFileId());
-//        } else {
+////        if (commonFile == null) {
-        // 阿里
+////            throw new BaseException(CodeEnum.PARAM_ERROR);
-//            String body = "{\"img\":\"\",\"url\":\""+generalBasic.getUrl()+"\",\"prob\":false,\"charInfo\":false,\"rotate\":false,\"table\":false}";
+////        }
-//            String body = "{\"img\":\""+img+"\",\"url\":\"\",\"prob\":false,\"charInfo\":false,\"rotate\":false,\"table\":false}";
+////        File file = new File(commonFile.getLocation());
-//            ApiResponse response = AliInstanceUtil.getGeneralAdvancedHttps().ocrAdvancedSyncMode(body.getBytes());
+//        ByteArrayOutputStream out = new ByteArrayOutputStream();
-//            time4 = System.currentTimeMillis();
+//        ImageUtil.scale(ImageIO.read((File)generalBasic.getFile()), out, 0.5f);
-//            log.info("阿里接口调用：{}", time4 -time3);
+////        Img.from(new URL(generalBasic.getUrl())).scale(0.5f).write(out);
-//            log.info("调用阿里的通用识别接口，请求：{}， 返回：{}", body, response);
+//        String img = Base64.encode(out.toByteArray());
-//            int code = response.getCode();
+//
-//            int curCode = 200;
+////        if (baidu) {
-//            if (code != curCode) {
+//        BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic();
-//                CodeEnum thirdError = CodeEnum.THIRD_ERROR;
+////            basic.setUrl(generalBasic.getUrl());
-//                thirdError.setMsg(response.getMessage());
+//        basic.setImage(img);
-//                throw new BaseException(thirdError);
+//        BaiDuVo.GeneralBasic words = BaiDuUtil.accurateBasic(Constant.BaiDu.APP_KEY, Constant.BaiDu.SECRET_KEY, basic);
-//            }
+//        log.info("文字识别:{}", words);
-//            String result = new String(response.getBody());
+//        if (words == null || CollectionUtil.isEmpty(words.getWordsResult())) {
-//            log.info("result:{}", result);
+//            return vos;
-//            JSONObject json = JSONObject.parseObject(result);
+//        }
-//            JSONArray infos = json.getJSONArray("prism_wordsInfo");
+//        words.getWordsResult().forEach(word -> contents.add(word.getWords()));
-//            for (Object obj: infos) {
+////        } else {
-//                JSONObject info = (JSONObject)obj;
+//        // 阿里
-//                contents.add(info.getString("word").replaceAll("\\s+",""));
+////            String body = "{\"img\":\"\",\"url\":\""+generalBasic.getUrl()+"\",\"prob\":false,\"charInfo\":false,\"rotate\":false,\"table\":false}";
+////            String body = "{\"img\":\""+img+"\",\"url\":\"\",\"prob\":false,\"charInfo\":false,\"rotate\":false,\"table\":false}";
+////            ApiResponse response = AliInstanceUtil.getGeneralAdvancedHttps().ocrAdvancedSyncMode(body.getBytes());
+////            time4 = System.currentTimeMillis();
+////            log.info("阿里接口调用：{}", time4 -time3);
+////            log.info("调用阿里的通用识别接口，请求：{}， 返回：{}", body, response);
+////            int code = response.getCode();
+////            int curCode = 200;
+////            if (code != curCode) {
+////                CodeEnum thirdError = CodeEnum.THIRD_ERROR;
+////                thirdError.setMsg(response.getMessage());
+////                throw new BaseException(thirdError);
+////            }
+////            String result = new String(response.getBody());
+////            log.info("result:{}", result);
+////            JSONObject json = JSONObject.parseObject(result);
+////            JSONArray infos = json.getJSONArray("prism_wordsInfo");
+////            for (Object obj: infos) {
+////                JSONObject info = (JSONObject)obj;
+////                contents.add(info.getString("word").replaceAll("\\s+",""));
+////            }
+//        Map<String, Integer> keyMap = new HashMap<>(16);
+//        rules.forEach(rule -> {
+//            JSONObject start = StrUtil.isEmpty(rule.getStart()) ? null : JSONObject.parseObject(rule.getStart());
+//            JSONObject end = StrUtil.isEmpty(rule.getEnd()) ? null : JSONObject.parseObject(rule.getEnd());
+//            StringBuilder builder;
+//
+//            if (start == null) {
+//                // 不知道这种场景
+//                return;
+//            } else if (start.containsKey(Constant.BaiDu.NUM)) {
+//                // 包含读取第几个
+//                builder = getContent(contents, keyMap, start);
+//            } else {
+//                builder = getContent(contents, start, end);
 //            }
-        Map<String, Integer> keyMap = new HashMap<>(16);
+//
-        rules.forEach(rule -> {
+//            QuestionOcrVo.GeneralBasic vo = new QuestionOcrVo.GeneralBasic();
-            JSONObject start = StrUtil.isEmpty(rule.getStart()) ? null : JSONObject.parseObject(rule.getStart());
+//            vo.setQuestionId(rule.getQuestionId());
-            JSONObject end = StrUtil.isEmpty(rule.getEnd()) ? null : JSONObject.parseObject(rule.getEnd());
+//            vo.setCode(rule.getCode());
-            StringBuilder builder;
+//            vo.setSort(rule.getSort());
-
+//            vo.setContent(builder.toString());
-            if (start == null) {
+//            vos.add(vo);
-                // 不知道这种场景
+//        });
-                return;
+//        long time5 = System.currentTimeMillis();
-            } else if (start.containsKey(Constant.BaiDu.NUM)) {
+//        log.info("数据处理时间：{}", time5 - time4);
-                // 包含读取第几个
+        return null;
-                builder = getContent(contents, keyMap, start);
-            } else {
-                builder = getContent(contents, start, end);
-            }
-
-            QuestionOcrVo.GeneralBasic vo = new QuestionOcrVo.GeneralBasic();
-            vo.setQuestionId(rule.getQuestionId());
-            vo.setCode(rule.getCode());
-            vo.setSort(rule.getSort());
-            vo.setContent(builder.toString());
-            vos.add(vo);
-        });
-        long time5 = System.currentTimeMillis();
-        log.info("数据处理时间：{}", time5 - time4);
-        return vos;
     }
 
     private StringBuilder getContent(List<String> contents, Map<String, Integer> keyMap, JSONObject start) {
@@ -174,6 +194,253 @@ public class OcrService implements IOcrService {
         return builder;
     }
 
+
+
+    @Override
+    public List<QuestionOcrVo.CodeAndAnswer> discernWords(List<MultipartFile> param, Long userId,Long projectId) throws IOException, ParseException {
+//        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(firstAidId);
+        FirstAid firstAidInfo = firstAidDao.queryByProjectId(projectId);
+        if (ObjectUtil.isNull(firstAidInfo)) {
+            throw new BaseException("急救信息错误");
+        }
+        List<QuestionOcrVo.CodeAndAnswer> resultList = new ArrayList<>();
+        // TODO 查询关键字规则  (暂时没有根据医院id查询)
+        List<OcrKeyword> ocrKeywordList = ocrKeywordDao.queryByHospital(firstAidInfo.getHospitalId());
+        log.info("规则：{}", ocrKeywordList);
+        if (ObjectUtil.isNull(ocrKeywordList)) {
+            return resultList;
+        }
+        SimpleDateFormat frontTime = new SimpleDateFormat("yy-MM-ddHH:mm");
+        String frontReg = "\\d{1,2}-\\d{1,2}-\\d{2,4}:\\d{1,2}";
+        Pattern frontPat = Pattern.compile(frontReg);
+        SimpleDateFormat backTime = new SimpleDateFormat("yyyyMMddHH");
+        String backReg = "\\d{1,6}:\\d{1,2}";
+        Pattern backPat = Pattern.compile(backReg);
+        Calendar instance = Calendar.getInstance();
+        int year = instance.get(Calendar.YEAR);
+
+        //查询发病时间
+        Long time = firstAidRecordDao.queryDiseaseTime(firstAidInfo.getId());
+
+        //识别图片,放入文字集合
+        List<String> strList = new ArrayList<>();
+        Long startOcr = System.currentTimeMillis();
+        for (MultipartFile file : param) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            ImageUtil.scale(ImageIO.read(file.getInputStream()), out, 1);
+            String img = Base64.encode(out.toByteArray());
+            BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic();
+            basic.setImage(img);
+            BaiDuVo.GeneralBasic words = BaiDuUtil.accurateBasic(Constant.BaiDu.APP_KEY, Constant.BaiDu.SECRET_KEY, basic);
+            log.info("文字识别:{}", words);
+            for (BaiDuVo.GeneralWord generalWord : words.getWordsResult()) {
+                strList.add(generalWord.getWords());
+            }
+
+            //保存图片
+            String extName = FileUtil.extName(file.getOriginalFilename());
+            String dir = PropUtil.path + File.separator + Constant.OrcImg.FILE_DIR;
+            String extraPath = DateUtil.format(new Date(), "yyyyMMdd");
+            String path = extraPath + File.separator+firstAidInfo.getId()+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName;
+            //转成file
+            File saveFile = new File(dir + extraPath);
+            if (!saveFile.exists()) {
+                saveFile.mkdirs();
+            }
+            String fullPath = dir + File.separator + path;
+            FileUtil.writeFromStream(file.getInputStream(), fullPath);
+
+        }
+        Long ocrEnd = System.currentTimeMillis();
+        log.info("识图+保存文件花费时间{}",ocrEnd-startOcr);
+        if (CollectionUtil.isEmpty(strList)) {
+            return resultList;
+        }
+        //TODO　查询出院时间　(暂时没有根据医院id查询)
+        OcrKeyword dischargeTime = ocrKeywordDao.queryDischargeTime(firstAidInfo.getHospitalId());
+        long timeOfDischarge = 0L;
+        if (ObjectUtil.isNotNull(dischargeTime)) {
+            for (String str : strList) {
+                if (str.contains(dischargeTime.getKeyword())) {
+                    JSONObject jsonObject = JSONObject.parseObject(dischargeTime.getQueryRule());
+                    String start = jsonObject.getString("start");
+                    String end = jsonObject.getString("end");
+                    String substring = str.substring(str.indexOf(start), str.lastIndexOf(end));
+                    StringBuilder str2 = new StringBuilder();
+                    for(int i=0;i<substring.length();i++) {
+                        if (str.charAt(i) >= 48 && str.charAt(i) <= 57) {
+                            str2.append(str.charAt(i));
+                        }
+                    }
+                    SimpleDateFormat dischargeSdf = new SimpleDateFormat("yyyyMMddHH");
+                    timeOfDischarge = dischargeSdf.parse(str2.toString()).getTime();
+                    //将code与答案保存到结果集合
+                   giveCodeAndAnswer(resultList,dischargeTime.getId(),(byte)0,Long.toString(timeOfDischarge),str2.toString(),0L,timeOfDischarge);
+                }
+            }
+        }
+
+        //循环关键字
+        for (OcrKeyword ocrKeyword : ocrKeywordList) {
+            for (int i = 0; i < strList.size(); i++) {
+                String regKey = ".*("+ocrKeyword.getKeyword()+").*";
+                if (strList.get(i).matches(regKey)){
+                    //校验
+                    if (0 != ocrKeyword.getVerifyType()){
+                        if (1 == ocrKeyword.getVerifyType()) {
+
+                            //验证发病时间
+                            if (ObjectUtil.isNull(time) || 0 == time) {
+                                //是否出院带药
+                                Matcher backMatcher = backPat.matcher(strList.get(i + 1));
+                                long endTimestamp = 0L;
+                                if (backMatcher.find()) {
+                                    String endTime = backMatcher.group();
+                                    endTimestamp = backTime.parse(year + endTime).getTime();
+                                }
+                                //将code与答案保存到结果集合
+                                giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"",strList.get(i),endTimestamp,timeOfDischarge);
+                            }else {
+                                Matcher frontMatcher = frontPat.matcher(strList.get(i));
+                                if (frontMatcher.find()){
+                                    Matcher backMatcher = backPat.matcher(strList.get(i + 1));
+                                    long endTimestamp = 0L;
+                                    if (backMatcher.find()) {
+                                        String endTime = backMatcher.group();
+                                        endTimestamp = backTime.parse(year + endTime).getTime();
+                                    }
+                                    String startTime = frontMatcher.group();
+                                    if (frontTime.parse(startTime).getTime()-time <= Constant.OrcImg.HOVER_48){
+                                        //将code与答案保存到结果集合
+                                        giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)1,"",strList.get(i),endTimestamp,timeOfDischarge);
+                                    }else{
+                                        //将code与答案保存到结果集合
+                                        giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"",strList.get(i),endTimestamp,timeOfDischarge);
+                                    }
+
+                                }
+                            }
+
+                        }
+                    }
+
+                    //关键字排除
+                    if (StrUtil.isNotBlank(ocrKeyword.getKeywordExclude())){
+                        String[] split = ocrKeyword.getKeywordExclude().split("\\|");
+                        for (String exclude : split) {
+                            for (int j = 0; j < resultList.size(); j++) {
+                                if (resultList.get(j).getMatchStr().contains(exclude)){
+                                    resultList.remove(j);
+                                }
+                            }
+                        }
+
+                        String regExclude = ".*("+ocrKeyword.getKeywordExclude()+").*";
+                        if (strList.get(i).contains(ocrKeyword.getKeyword()) && !strList.get(i).matches(regExclude)) {
+                            //查询结束的时间
+                            Matcher backMatcher = backPat.matcher(strList.get(i + 1));
+                            long endTimestamp = 0L;
+                            if (backMatcher.find()) {
+                                String endTime = backMatcher.group();
+                                endTimestamp = backTime.parse(year + endTime).getTime();
+                            }
+                            //将code与答案保存到结果集合
+                            giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"无",strList.get(i),endTimestamp,timeOfDischarge);
+                        }
+                    }
+
+                    //查询规则
+                    if (StrUtil.isNotBlank(ocrKeyword.getQueryRule())){
+                        if (ocrKeyword.getKeyword().equals(dischargeTime.getKeyword())){
+                            continue;
+                        }
+                        JSONObject jsonObject = JSONObject.parseObject(ocrKeyword.getQueryRule());
+                        String start = jsonObject.getString("start");
+                        String end = jsonObject.getString("end");
+                        if (strList.get(i).contains(start) && strList.get(i).contains(end)) {
+                            log.info("字符串:{}",strList.get(i));
+                            String substring = strList.get(i).substring(strList.get(i).indexOf(start) + start.length(), strList.get(i).lastIndexOf(end));
+                            String newStr = substring.replaceAll("[^\u4E00-\u9FA5]", "");
+                            //查询结束的时间
+                            Matcher backMatcher = backPat.matcher(strList.get(i + 1));
+                            long endTimestamp = 0L;
+                            if (backMatcher.find()) {
+                                String endTime = backMatcher.group();
+                                endTimestamp = backTime.parse(year + endTime).getTime();
+                            }
+                            //将code与答案保存到结果集合
+                            giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,newStr,strList.get(i),endTimestamp,timeOfDischarge);
+                        }
+                    }
+
+
+                    if (0 == ocrKeyword.getVerifyType() && StrUtil.isBlank(ocrKeyword.getKeywordExclude()) && StrUtil.isBlank(ocrKeyword.getQueryRule())) {
+                        //查询结束的时间
+                        Matcher backMatcher = backPat.matcher(strList.get(i + 1));
+                        long endTimestamp = 0L;
+                        if (backMatcher.find()) {
+                            String endTime = backMatcher.group();
+                            endTimestamp = backTime.parse(year + endTime).getTime();
+                        }
+                        //将code与答案保存到结果集合
+                        giveCodeAndAnswer(resultList,ocrKeyword.getId(),(byte)0,"",strList.get(i),endTimestamp,timeOfDischarge);
+                    }
+                }
+            }
+        }
+        ArrayList<QuestionOcrVo.CodeAndAnswer> newList = resultList.stream().collect(Collectors
+                .collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QuestionOcrVo.CodeAndAnswer::getAnswer))), ArrayList::new));
+        return newList;
+    }
+
+    /**
+     * 保存code与答案
+     * @param resultList 保存结果的集合
+     * @param keyId     关键词id
+     * @param isOk      是否验证(0-否,1-是)
+     * @param answer    答案(选项是无,使用此答案)
+     * @param matchStr  匹配到的字符串
+     * @param endTime   结束时间
+     * @param timeOfDischarge  出院时间
+     */
+    public void giveCodeAndAnswer(List<QuestionOcrVo.CodeAndAnswer> resultList,Long keyId,Byte isOk,String answer,String matchStr,Long endTime,Long timeOfDischarge) {
+        List<OcrKeywordOption> keywordOptionList  = keywordOptionDao.queryByKeyId(keyId);
+        if (CollectionUtil.isNotEmpty(keywordOptionList)) {
+            for (OcrKeywordOption ocrKeywordOption : keywordOptionList) {
+                // TODO 出院带药 code: CYQK-CYDY
+                if ("CYQK-CYDY".equals(ocrKeywordOption.getCode())){
+                    //出院带药 校验时间
+                    QuestionOcrVo.CodeAndAnswer result = new QuestionOcrVo.CodeAndAnswer();
+                    result.setCode(ocrKeywordOption.getCode());
+                    result.setAnswer(ocrKeywordOption.getAnswer());
+                    if (0 != endTime && 0 != timeOfDischarge) {
+                        if (endTime > timeOfDischarge) {
+                            result.setIsOk((byte)1);
+                        }else{
+                            result.setIsOk((byte)0);
+                        }
+                    }else{
+                        result.setIsOk((byte)0);
+                    }
+                    result.setMatchStr(matchStr);
+                    resultList.add(result);
+                }else {
+                    QuestionOcrVo.CodeAndAnswer result = new QuestionOcrVo.CodeAndAnswer();
+                    result.setCode(ocrKeywordOption.getCode());
+                    if ("无".equals(ocrKeywordOption.getAnswer())) {
+                        result.setAnswer(answer);
+                    }else {
+                        result.setAnswer(ocrKeywordOption.getAnswer());
+                    }
+                    result.setIsOk(isOk);
+                    result.setMatchStr(matchStr);
+                    resultList.add(result);
+                }
+
+            }
+        }
+    }
+
 }
 
 

src/main/java/com/ccsens/carbasics/service/OrganizationMemberService.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.service;
+
+import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
+import com.ccsens.carbasics.persist.dao.OrganizationMemberDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2021/9/17 16:02
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class OrganizationMemberService implements IOrganizationMemberService {
+
+    @Resource
+    private OrganizationMemberDao organizationMemberDao;
+
+    @Override
+    public OrganizationMemberVo.Organization getHospital(Long userId) {
+        OrganizationMemberVo.Organization organization = organizationMemberDao.getHospital(userId);
+        return organization;
+    }
+}

src/main/java/com/ccsens/carbasics/service/OrganizationService.java

@@ -1,11 +1,15 @@
 package com.ccsens.carbasics.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.carbasics.bean.dto.OrganizationDto;
-import com.ccsens.carbasics.bean.po.Organization;
+import com.ccsens.carbasics.bean.po.*;
 import com.ccsens.carbasics.bean.vo.OrganizationVo;
 import com.ccsens.carbasics.persist.dao.OrganizationDao;
+import com.ccsens.carbasics.persist.mapper.OrganizationParentMapper;
 import com.ccsens.carbasics.util.Constant;
+import com.ccsens.util.WebConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -13,7 +17,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -27,6 +33,10 @@ public class OrganizationService implements IOrganizationService {
 
     @Resource
     private OrganizationDao organizationDao;
+    @Resource
+    private OrganizationParentMapper organizationParentMapper;
+    @Resource
+    private Snowflake snowflake;
 
     @Override
     public OrganizationVo.Rank rank(OrganizationDto.Rank param, Long userId) {
@@ -46,9 +56,14 @@ public class OrganizationService implements IOrganizationService {
                 break;
             default:break;
         }
+        for (int i = 0; i<items.size(); i++) {
+            OrganizationVo.RankItem item = items.get(i);
+            item.setRank(i+1);
+        }
         OrganizationVo.RankItem self = null;
         if (organization != null && organization.getOrganizationType() == Constant.Organization.HOSPITAL && CollectionUtil.isNotEmpty(items)) {
-            for (OrganizationVo.RankItem item: items) {
+            for (int i = 0; i<items.size(); i++) {
+                OrganizationVo.RankItem item = items.get(i);
                 if (item.getId().longValue() == organization.getId().longValue()) {
                     self = item;
                     break;
@@ -60,4 +75,79 @@ public class OrganizationService implements IOrganizationService {
         rank.setList(items);
         return rank;
     }
+
+    @Override
+    public String importCode(List<Object[]> rowList, Long userId) throws Exception {
+        if (CollectionUtil.isEmpty(rowList)) {
+            return null;
+        }
+        List<Organization> organizations = new ArrayList<>();
+        List<OrganizationParent> parents = new ArrayList<>();
+        Map<String, Long> nameMap = new HashMap<>();
+        int nameIndex = 0;
+        StringBuilder builder = new StringBuilder();
+        rowList.forEach(row -> {
+            if (row == null || row.length <= nameIndex || StrUtil.isBlank((String)row[nameIndex])) {
+                return;
+            }
+            Organization newOrganization = new Organization();
+            String name = (String)row[nameIndex];
+            name = name.trim();
+            Organization oldOrganization = organizationDao.getOrganizationByName(name);
+            newOrganization.setId(oldOrganization == null ? snowflake.nextId() : oldOrganization.getId());
+            newOrganization.setName(name);
+            newOrganization.setOperator(userId);
+            for (String key: Constant.Organization.typeMap.keySet()) {
+                if (name.endsWith(key)) {
+                    newOrganization.setOrganizationType(Constant.Organization.typeMap.get(key));
+                }
+            }
+            if (newOrganization.getOrganizationType() == null) {
+                builder.append(name).append("无法判断类型，设置默认类型为医院。");
+                newOrganization.setOrganizationType(Constant.Organization.HOSPITAL);
+            }
+            newOrganization.setCode(row.length > 1 && row[1] != null ? (String)row[1] : "");
+            newOrganization.setShortName(row.length > 2 && row[2] != null ? (String)row[2] : "");
+            newOrganization.setIntroduce(row.length > 3 && row[3] != null ? (String)row[3] : "");
+            newOrganization.setLevel(row.length > 4 && row[4] != null ? Byte.parseByte((String)row[4])  : 0);
+            organizations.add(newOrganization);
+            nameMap.put(name, newOrganization.getId());
+            int parentIndex = 5;
+            if (row.length <= parentIndex || row[parentIndex] == null || StrUtil.isBlank((String)row[parentIndex])) {
+                return;
+            }
+            String parentCell = (String) row[parentIndex];
+            String[] parentNames = parentCell.split(Constant.STRING_REGEX);
+            for (String parentName: parentNames) {
+                parentName = parentName.trim();
+                if (!nameMap.containsKey(parentName)) {
+                    builder.append(name).append("的上级").append(parentName)
+                            .append("未找到，请检查机构排序是否存在或排序是否正确。");
+                } else {
+                    OrganizationParent parent = new OrganizationParent();
+                    if (oldOrganization != null) {
+                        // 删除原有的上下级关系
+                        OrganizationParentExample parentExample = new OrganizationParentExample();
+                        parentExample.createCriteria().andOrganizationIdEqualTo(oldOrganization.getId());
+                        OrganizationParent update = new OrganizationParent();
+                        update.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
+                        organizationParentMapper.updateByExampleSelective(update, parentExample);
+                    }
+                    parent.setId(snowflake.nextId());
+                    parent.setOrganizationId(newOrganization.getId());
+                    parent.setParentId(nameMap.get(parentName));
+                    parent.setOperator(userId);
+                    parents.add(parent);
+                }
+            }
+
+        });
+        if (CollectionUtil.isNotEmpty(organizations)) {
+            organizationDao.batchInsert(organizations);
+        }
+        if (CollectionUtil.isNotEmpty(parents)) {
+            organizationDao.batchInsertParent(parents);
+        }
+        return builder.toString();
+    }
 }

src/main/java/com/ccsens/carbasics/service/QcpProjectService.java

@@ -192,11 +192,11 @@ public class QcpProjectService implements IQcpProjectService {
 //        return createCaseV;
 //    }
 
-    @Override
+//    @Override
-    public void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception {
+//    public void switchProject(ProjectDto.SwitchProject param, Long userId) throws Exception {
-        Set<String> userIds = new HashSet<>();
+//        Set<String> userIds = new HashSet<>();
-        userIds.add(userId.toString());
+//        userIds.add(userId.toString());
-        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId());
+//        SwitchoverProjectUtil.switchoverProject(userIds,param.getProjectId());
-    }
+//    }
 
 }

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -0,0 +1,92 @@
+package com.ccsens.carbasics.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
+import com.ccsens.carbasics.bean.po.Organization;
+import com.ccsens.carbasics.bean.po.Questionnaire;
+import com.ccsens.carbasics.bean.po.QuestionnaireDetail;
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+import com.ccsens.carbasics.persist.dao.AreaDao;
+import com.ccsens.carbasics.persist.dao.OrganizationDao;
+import com.ccsens.carbasics.persist.dao.QuestionnaireDao;
+import com.ccsens.carbasics.persist.dao.QuestionnaireDetailDao;
+import com.ccsens.carbasics.persist.mapper.OrganizationProjectMapper;
+import com.ccsens.carbasics.util.DefaultCodeError;
+import com.ccsens.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class QuestionnaireService implements IQuestionnaireService{
+
+    @Resource
+    private QuestionnaireDao questionnaireDao;
+    @Resource
+    private QuestionnaireDetailDao questionnaireDetailDao;
+    @Resource
+    private AreaDao areaDao;
+    @Resource
+    private Snowflake snowflake;
+    @Resource
+    private OrganizationDao organizationDao;
+
+    @Override
+    public List<QuestionnaireVo.AreaInfo> queryArea(QuestionnaireDto.QueryArea param, Long userId) {
+        if (ObjectUtil.isNull(param.getId())){
+            param.setId(0L);
+        }
+        return areaDao.queryByParentId(param.getId());
+    }
+
+
+    @Override
+    public QuestionnaireVo.QuestionnaireInfo queryQuestionnaire(QuestionnaireDto.QueryQuestionnaire param, Long userId) {
+        return questionnaireDao.queryQuestionnaire(param.getTime(),param.getType(),userId);
+    }
+
+    @Override
+    public void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId) {
+        //查询是否重复提交
+        Long time = System.currentTimeMillis();
+        QuestionnaireVo.QuestionnaireInfo questionnaireInfo = questionnaireDao.queryRepeat(param.getHospitalName(),time,param.getType());
+        if (ObjectUtil.isNotNull(questionnaireInfo.getDetail())) {
+            throw new BaseException(DefaultCodeError.HOSPITAL_REPEAT_SUBMIT);
+        }
+
+        QuestionnaireDetail questionnaireDetail = new QuestionnaireDetail();
+        BeanUtil.copyProperties(param,questionnaireDetail);
+        questionnaireDetail.setId(snowflake.nextId());
+        questionnaireDetail.setQuestionnaireId(param.getQuestionnaireId());
+        questionnaireDetailDao.insertSelective(questionnaireDetail);
+    }
+
+
+    @Override
+    public List<QuestionnaireVo.WriteStatus> queryNotWrite(QuestionnaireDto.QueryNotWrite param, Long userId) {
+        Organization organization = organizationDao.getByProjectId(param.getProjectId());
+        if (ObjectUtil.isNull(organization)) {
+            throw new BaseException(DefaultCodeError.NOT_ORGANIZATION);
+        }
+        List<QuestionnaireVo.WriteStatus> writeStatusList = questionnaireDao.queryNotWrite(organization.getName(),param.getTime());
+        for (QuestionnaireVo.WriteStatus writeStatus : writeStatusList) {
+            if (ObjectUtil.isNull(writeStatus.getDetailId())) {
+                writeStatus.setIsWrite((byte) 0);
+            }else {
+                writeStatus.setIsWrite((byte) 1);
+            }
+        }
+        return writeStatusList;
+    }
+
+}

src/main/java/com/ccsens/carbasics/service/StatisticalService.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -156,7 +157,7 @@ public class StatisticalService implements IStatisticalService {
                 hospitalIds, param.getStartTime(), param.getEndTime());
         // 溶栓率 四舍五入，保留两位 52.33%
         String rate = timeWindowPatient == null || timeWindowPatient == 0 ? "" :
-                new BigDecimal(thrombosis*100.00).divide(new BigDecimal(timeWindowPatient), 2, BigDecimal.ROUND_HALF_UP) + "%";
+                new BigDecimal(thrombosis*100.00).divide(new BigDecimal(timeWindowPatient), 2, BigDecimal.ROUND_HALF_UP) + "";
         common.setTotal(rate);
         List<StatisticalVo.Item> newItems = fillItems(items, param.getStartTime(), param.getEndTime(), param.getCountType());
         common.setList(newItems);
@@ -164,10 +165,13 @@ public class StatisticalService implements IStatisticalService {
     }
 
 
-    private List<StatisticalVo.Item> fillItems(List<StatisticalVo.Item> items, Long startTime, Long endTime, Byte countType) {
+    private List<StatisticalVo.Item> fillItems(List<StatisticalVo.Item> items, Long startTime, Long endTime, Byte countType)  {
         Map<String, StatisticalVo.Item> map = new HashMap<>();
         List<StatisticalVo.Item> newItems = new ArrayList<>();
         items.forEach(item -> map.put(item.getName(), item));
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(startTime);
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         int unit = Calendar.DAY_OF_YEAR;
         if (countType == Constant.Param.COUNT_TYPE_HOUR) {
@@ -176,18 +180,27 @@ public class StatisticalService implements IStatisticalService {
         } else if (countType == Constant.Param.COUNT_TYPE_MONTH) {
             sdf = new SimpleDateFormat("yyyy-MM");
             unit = Calendar.MONTH;
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+        } else if (countType == Constant.Param.COUNT_TYPE_DAY) {
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
         }
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
 
-        Calendar calendar = Calendar.getInstance();
+        try {
-        calendar.setTimeInMillis(startTime);
+            while (calendar.getTimeInMillis() <= endTime) {
-        while (calendar.getTimeInMillis() <= endTime) {
+                String format = sdf.format(calendar.getTime());
-            String format = sdf.format(calendar.getTime());
+                long time = sdf.parse(format).getTime();
-            if (map.containsKey(format)) {
+                if (map.containsKey(format)) {
-                newItems.add(new StatisticalVo.Item(calendar.getTimeInMillis() + "", map.get(format).getValue()));
+                    newItems.add(new StatisticalVo.Item( time + "", map.get(format).getValue()));
-            } else {
+                } else {
-                newItems.add(new StatisticalVo.Item(calendar.getTimeInMillis() + "", null));
+                    newItems.add(new StatisticalVo.Item(time + "", null));
+                }
+                calendar.add(unit, 1);
             }
-            calendar.add(unit, 1);
+        } catch (ParseException e) {
+            log.error("时间戳转换异常", e);
         }
         return newItems;
     }
@@ -218,7 +231,7 @@ public class StatisticalService implements IStatisticalService {
         List<Long> hospitalIds = getHospitalIds(param.getProjectId());
         List<StatisticalVo.Item> items = firstAidRecordDao.countTimeMedian(param.getMinuendCode(), param.getSubtractionCode(), hospitalIds, param.getStartTime(), param.getEndTime(), param.getCountType());
         StatisticalVo.Common common = new StatisticalVo.Common();
-        BigDecimal median = firstAidRecordDao.countMedian(Constant.Statistical.Dnt.MINUEND_CODE, Constant.Statistical.Dnt.SUBTRACTION_CODE, hospitalIds, param.getStartTime(), param.getEndTime());
+        BigDecimal median = firstAidRecordDao.countMedian(param.getMinuendCode(), param.getSubtractionCode(), hospitalIds, param.getStartTime(), param.getEndTime());
         common.setTotal(median == null ? "" : median.toString());
         List<StatisticalVo.Item> newItems = fillItems(items, param.getStartTime(), param.getEndTime(), param.getCountType());
         common.setList(newItems);

src/main/java/com/ccsens/carbasics/util/Constant.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.util;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -96,6 +97,16 @@ public class Constant {
     public static final class Organization{
         /**医院*/
         public final static byte HOSPITAL = 3;
+        public final static Map<String, Byte> typeMap = new HashMap<>();
+
+        static {
+            typeMap.put("省卫健委", (byte)0);
+            typeMap.put("省质控", (byte)1);
+            typeMap.put("市质控", (byte)2);
+            typeMap.put("医院", (byte)3);
+        }
+
+
     }
 
     /**科室相关*/
@@ -276,6 +287,7 @@ public class Constant {
         ApplyForRefuse((byte) 7,"申请拒绝"),
         join((byte) 8,"加入"),
         quit((byte) 9,"退出"),
+        ReportedSuccess((byte)10,"上报成功"),
         ;
         public byte status;
         public String message;
@@ -310,4 +322,14 @@ public class Constant {
             }
         }
     }
+
+    /**
+     * orc相关
+     */
+    public final static class OrcImg {
+        //48小时
+        public static final Long HOVER_48 = 172800000L;
+
+        public static final String FILE_DIR = "orcImage" + File.separator;
+    }
 }

src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java

@@ -41,6 +41,7 @@ public class DefaultCodeError extends CodeError {
     public static final Code SURPASS_MAX_NUMBER = new Code(32,"超过最大申请修改次数", true);
     public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
     public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改，无法修改状态", true);
+    public static final Code HOSPITAL_REPEAT_SUBMIT = new Code(35,"当前医院已提交过问卷调查,请勿重复操作", true);
 
 
 

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: prod
-    include: common, util-dev
+    include: common, util-prod

src/main/resources/mapper_dao/AreaDao.xml

@@ -0,0 +1,39 @@
+<?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.ccsens.carbasics.persist.dao.AreaDao">
+
+    <resultMap id="area" type="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
+        <id column="shengid" property="id"/>
+        <result column="sheng" property="name"/>
+        <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
+            <id column="shiid" property="id"/>
+            <result column="shiname" property="name"/>
+            <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
+                <id column="quid" property="id"/>
+                <result column="quname" property="name"/>
+            </collection>
+        </collection>
+    </resultMap>
+
+    <select id="queryByParentId" resultMap="area">
+        SELECT
+            a.id AS shengid,
+            a.area_name AS sheng,
+            a1.id AS shiid,
+            a1.area_parent_id AS shif,
+            a1.area_name AS shiname,
+            a2.id AS quid,
+            a2.area_parent_id AS quf,
+            a2.area_name AS quname
+        FROM
+            t_area AS a
+        LEFT JOIN t_area AS a1 ON a.id = a1.area_parent_id
+        LEFT JOIN t_area AS a2 ON a1.id = a2.area_parent_id
+        WHERE
+            a.area_parent_id = 0
+        AND a.area_type = 0
+        AND a1.area_type = 0
+        AND a2.area_type = 0
+    </select>
+
+</mapper>

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -15,7 +15,7 @@
         and r.question_code = 'CYQK-CYSJ' and r.rec_status = 0
         left join t_qcp_first_aid_record r1  on a.id  = r1.first_aid_id and r1.rec_status = 0
         <choose>
-            <when test="param.firstAidType == 0">and r1.question_code='JBXX-FBSJ'</when>
+            <when test="param.firstAidType == 0">and r1.question_code='JBXX-FBTime'</when>
             <when test="param.firstAidType == 1">and r1.question_code='CYQK-LYFS'</when>
         </choose>
         left join t_qcp_first_aid_record r2 on a.id = r2.first_aid_id and r2.rec_status = 0
@@ -74,12 +74,17 @@
             `type`,
             nation,
             idcard,
+            reported,
             data_status AS dataStatus,
+            project_id as projectId,
             updated_at
             FROM
             t_qcp_first_aid
             WHERE
-            data_status = #{param.dataStatus}
+            hospital_id = #{hospitalId}
+            AND value_type = 0
+            <if test="param.dataStatus != null"> and data_status = #{param.dataStatus}</if>
+            <if test="param.reported != null"> and reported = #{param.reported}</if>
             <if test="param.name!=null and param.name!=''">
                 AND `name` LIKE concat('%',#{param.name},'%')
             </if>
@@ -87,8 +92,9 @@
                 AND idcard LIKE concat('%',#{param.idcard},'%')
             </if>
             AND rec_status = 0
-            AND hospital_id = #{hospitalId}
+            <foreach collection="templates" item="id" open="AND type in (" close=")" separator=",">
-            AND type = #{template}
+                #{id}
+            </foreach>
         ) t
         LEFT JOIN t_qcp_first_aid_record t1 ON t.firstAidId = t1.first_aid_id
         AND t1.question_code = 'JBXX-ZYH'
@@ -103,7 +109,10 @@
         AND t4.question_code = 'CYQK-CYSJ'
         AND t4.rec_status = 0
         WHERE
-        t4.id IS NULL
+        <choose>
+            <when test="param.queryType == 0">t4.id IS NULL</when>
+            <otherwise>t4.id IS NOT NULL</otherwise>
+        </choose>
         <if test="param.hospitalNumber!=null and param.hospitalNumber!=''">
             AND t1.answer LIKE concat('%',#{param.hospitalNumber},'%')
         </if>
@@ -113,8 +122,8 @@
         <if test="param.endTime!=null and param.endTime!=0">
         AND t2.answer + 0 &lt; #{param.endTime}
         </if>
-        GROUP BY
+        GROUP BY t.firstAidId
-        t.updated_at DESC
+        ORDER BY t.updated_at DESC
     </select>
     <select id="queryPatientListBySecretary"
             resultType="com.ccsens.carbasics.bean.vo.PatientVo$PatientListByQuality">
@@ -134,11 +143,13 @@
             nation,
             idcard,
             data_status AS dataStatus,
+            project_id as projectId,
             updated_at
             FROM
             t_qcp_first_aid
             WHERE
             data_status in (1,3,5,6)
+            AND value_type = 0
             <if test="param.name!=null and param.name!=''">
                 AND `name` LIKE concat('%',#{param.name},'%')
             </if>
@@ -171,7 +182,30 @@
                 AND t2.answer + 0 &lt; #{param.endTime}
             </if>
         </trim>
-        GROUP BY
+        GROUP BY t.firstAidId
-        t.updated_at DESC
+        ORDER BY t.updated_at DESC
+    </select>
+
+    <select id="queryByProjectId" resultType="com.ccsens.carbasics.bean.po.FirstAid">
+        SELECT
+            id,
+            `name`,
+            gender,
+            age,
+            nation,
+            idcard,
+            phone,
+            type,
+            value_type,
+            save_type,
+            data_status,
+            project_id,
+            hospital_id,
+            operator
+        FROM
+            t_qcp_first_aid
+        WHERE
+            project_id = #{projectId}
+        AND rec_status = 0
     </select>
 </mapper>

src/main/resources/mapper_dao/FirstAidLogDao.xml

@@ -8,6 +8,7 @@
             <id column="id" property="id"/>
             <result column="role" property="role"/>
             <result column="name" property="name"/>
+            <result column="currentDoctor" property="currentDoctor"/>
         </collection>
     </resultMap>
 
@@ -17,13 +18,16 @@
             l.id,
             l.first_aid_id,
             l.operation_role as role,
-            m.name
+            m.name,
+            if (am.record_user_id = l.operation_user_id, 1 , 0) as currentDoctor
         FROM
             t_qcp_first_aid_log l,
-            t_organization_member m
+            t_organization_member m,
+            t_qcp_first_aid_member am
         WHERE
             l.operation_user_id = m.user_id
-            AND l.operation_type IN ( 0, 7 )
+            AND l.first_aid_id = am.first_aid_id
+            AND l.operation_type IN ( 0, 8 )
             AND l.operation_role IN ( 0, 1, 2 )
             AND l.first_aid_id IN
             <foreach collection="firstAidIds" item="id" open="(" close=")" separator=",">
@@ -31,6 +35,8 @@
             </foreach>
             AND l.rec_status = 0
             AND m.rec_status = 0
+            AND am.rec_status = 0
+        group by l.first_aid_id, l.operation_role, l.operation_user_id
     </select>
 
     <select id="countUpdateNumber" resultType="java.lang.Integer">

src/main/resources/mapper_dao/FirstAidRecordDao.xml

@@ -5,7 +5,7 @@
 
     <select id="countTimeWindowPatient" resultType="java.lang.Long">
         select count(*) from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
-        where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBSJ'
+        where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBTime'
         and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
         and r2.answer + 0 &gt;= #{startTime} and r2.answer + 0 &lt;= #{endTime}
         <foreach collection="hospitalIds" item="id" separator="," open="and a.hospital_id in (" close=")">
@@ -35,7 +35,7 @@
         from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
         where a.id = r1.first_aid_id and r1.question_code = 'JMRSSJ'
         and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
-        and r1.answer + 0 &lt;= #{startTime} and r1.answer + 0 &gt;= #{endTime}
+        and r1.answer + 0 &lt;= #{endTime} and r1.answer + 0 &gt;= #{startTime}
         <foreach collection="hospitalIds" item="id" separator="," open="and a.hospital_id in (" close=")">
             #{id}
         </foreach>
@@ -68,7 +68,8 @@
         (
         select
         ROUND((r1.answer - r2.answer)/60000, 2) as val
-        from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
+        from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2,
+        (SELECT @rownum:=0) r
         where a.id = r1.first_aid_id and r1.question_code = #{minuendCode}
         and a.id = r2.first_aid_id and r2.question_code = #{subtractionCode}
         and r1.answer + 0 &gt;= #{startTime} and r1.answer + 0 &lt;= #{endTime}
@@ -77,9 +78,8 @@
         </foreach>
         AND a.value_type = 0 and a.data_status in (1, 3, 5, 6)
         and a.rec_status = 0 and r1.rec_status = 0 and r2.rec_status = 0
-        )d,
+        order by r1.answer - r2.answer asc
-        (SELECT @rownum:=0) r
+        )d
-        ORDER BY d.val
         ) as dd
         WHERE dd.row_number IN ( FLOOR((@total_rows+1)/2), FLOOR((@total_rows+2)/2) )
     </select>
@@ -92,7 +92,7 @@
         and unix_timestamp(created_at)*1000  &gt;= #{startTime} and unix_timestamp(created_at)*1000 &lt;= #{endTime} and rec_status = 0
     </select>
     <select id="countThrombosisRateDate" resultType="com.ccsens.carbasics.bean.vo.StatisticalVo$Item">
-        select t1.date as name, concat(round(t2.part * 100 / t1.total, 2), '%') as value from
+        select t1.date as name, round(t2.part * 100 / t1.total, 2) as value from
         (select
         <choose>
             <when test="countType == 0">FROM_UNIXTIME(r2.answer/1000,'%Y-%m-%d %H') as date,</when>
@@ -101,7 +101,7 @@
             <otherwise>FROM_UNIXTIME(r2.answer/1000,'%Y-%m-%d') as date,</otherwise>
         </choose>
          count(*) as total from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
-        where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBSJ'
+        where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBTime'
         and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
         and r2.answer + 0 &gt;= #{startTime} and r2.answer + 0 &lt;= #{endTime}
         <foreach collection="hospitalIds" item="id" separator="," open="and a.hospital_id in (" close=")">
@@ -155,21 +155,23 @@
         WHERE
         a.id = r1.first_aid_id
         and a.id = r2.first_aid_id
-        AND r2.question_code = #{param.accordCode}
         AND r1.question_code = #{param.questionCode}
+        AND r2.question_code = #{param.accordCode}
         AND a.hospital_id IN
         <foreach collection="hospitalIds" open="(" close=")" separator="," item="hospitalId">
             #{hospitalId}
         </foreach>
         AND a.value_type = 0 and a.data_status in (1, 3, 5, 6)
-        AND a.rec_status = 0
-        AND r1.rec_status = 0
         <if test="param.startTime!=null and param.startTime!=0">
             AND r2.answer + 0 &gt;= #{param.startTime}
         </if>
         <if test="param.endTime!=null and param.endTime!=0">
             AND r2.answer + 0 &lt;= #{param.endTime}
         </if>
+        AND r1.answer != ''
+        AND a.rec_status = 0
+        AND r1.rec_status = 0
+        AND r2.rec_status = 0
         GROUP BY
         r1.answer
     </select>
@@ -184,7 +186,7 @@
             t_qcp_first_aid_record r2
         WHERE
             a.id = r1.first_aid_id
-            AND r1.question_code = 'JBXX-FBSJ'
+            AND r1.question_code = 'JBXX-FBTime'
             AND a.id = r2.first_aid_id
             AND r2.question_code = 'JBXX-DYSJ'
             AND r2.answer + 0 &gt;= #{startTime}
@@ -215,7 +217,7 @@
             <otherwise>FROM_UNIXTIME(r1.answer/1000,'%Y-%m-%d') as date,</otherwise>
         </choose>
         ROUND((r1.answer - r2.answer)/60000, 2) as val
-        from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
+        from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2, (select @rk := 0, @team := '') t
         where a.id = r1.first_aid_id and r1.question_code = #{minuendCode}
         and a.id = r2.first_aid_id and r2.question_code = #{subtractionCode}
         and r1.answer + 0 &gt;= #{startTime} and r1.answer + 0 &lt;= #{endTime}
@@ -224,9 +226,9 @@
         </foreach>
         AND a.value_type = 0 and a.data_status in (1, 3, 5, 6)
         and a.rec_status = 0 and r1.rec_status = 0 and r2.rec_status = 0
-        ) d,
+        order by r1.answer/1000, r1.answer/1000
-        (select @rk := 0, @team := '') t
+        ) d
-        order by date, val) t1
+        ) t1
         left join (
         select
         <choose>
@@ -235,7 +237,7 @@
             <when test="type == 2">FROM_UNIXTIME(r1.answer/1000,'%Y-%m') as date,</when>
             <otherwise>FROM_UNIXTIME(r1.answer/1000,'%Y-%m-%d') as date,</otherwise>
         </choose>
-        count(*) as cnt
+        count(*)/2 as cnt
         from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
         where a.id = r1.first_aid_id and r1.question_code = #{minuendCode}
         and a.id = r2.first_aid_id and r2.question_code = #{subtractionCode}
@@ -259,11 +261,11 @@
     <select id="countAreaMedian" resultType="com.ccsens.carbasics.bean.vo.StatisticalVo$Item">
         select b.id,b.shortName as name, avg(b.val) as value from
         (select id,shortName,val,@team,
-        case @team when id then @rk := @rk + 1 else @rk := 1 end rk,
+        if(val is null, 0, CASE @team WHEN id THEN @rk := @rk + 1 ELSE @rk := 1  END) rk,
         @team := id
         from (
         select city.id, city.short_name as shortName, aid.val from
-        (select city.id, city.short_name from t_organization o, t_organization_parent p, t_organization city
+        (select city.id, city.short_name from t_organization o, t_organization_parent p, t_organization city,(select @rk := 0, @team := '') a
         where o.id = p.parent_id and p.organization_id = city.id AND city.organization_type = 2
         and o.code = #{param.code} and o.rec_status = 0 and p.rec_status = 0 and city.rec_status = 0) city
         left join
@@ -272,6 +274,7 @@
         (
         select
         a.hospital_id,
+        r1.id as recordId,
         ROUND((r1.answer - r2.answer)/60000, 2) as val
         from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
         where a.id = r1.first_aid_id and r1.question_code = #{param.minuendCode}
@@ -280,10 +283,12 @@
         AND a.value_type = 0 and a.data_status in (1, 3, 5, 6)
         and a.rec_status = 0 and r1.rec_status = 0 and r2.rec_status = 0
         ) aid on hospital.id = aid.hospital_id
-        ) t1, (select @rk := 0, @team := '') a order by id,val) b
+        group by city.id,aid.recordId
+        order by city.id,aid.val
+        ) t1) b
         left join
         (
-        select city.id, city.short_name as shortName, count(aid.id) as cnt from
+        select city.id, city.short_name as shortName, count(aid.id)/2 as cnt from
         (select city.id, city.short_name from t_organization o, t_organization_parent p, t_organization city
         where o.id = p.parent_id and p.organization_id = city.id
         and o.code = #{param.code} and o.rec_status = 0 and p.rec_status = 0 and city.rec_status = 0) city
@@ -310,8 +315,8 @@
     </select>
     <select id="subentrySpecifyAnswer" resultType="com.ccsens.carbasics.bean.vo.StatisticalVo$Item">
         SELECT
-        FROM_UNIXTIME( r2.answer / 1000, #{type} ),
+        FROM_UNIXTIME( r2.answer / 1000, #{type} ) as name,
-        count( a.id )
+        count( a.id ) as value
         FROM
         t_qcp_first_aid a,
         t_qcp_first_aid_record r1,
@@ -393,7 +398,7 @@
         WHERE
         a.id = r1.first_aid_id
         AND a.id = r2.first_aid_id
-        AND r1.question_code = 'JBXX-FBSJ'
+        AND r1.question_code = 'JBXX-FBTime'
         AND a.id = r2.first_aid_id
         AND r2.question_code = 'JBXX-DYSJ'
         AND r2.answer + 0 &gt;= #{startTime}
@@ -540,9 +545,9 @@
         t_qcp_first_aid_record r2
         WHERE
         a.id = r1.first_aid_id
-        AND r1.question_code = 'JBXX-FBSJ'
+        AND r1.question_code = 'JBXX-FBTime'
         AND a.id = r2.first_aid_id
-        AND r1.question_code = 'JBXX-DYSJ'
+        AND r2.question_code = 'JBXX-DYSJ'
         AND r2.answer + 0 &gt;= #{startTime}
         AND r2.answer + 0 &lt;= #{endTime}
         AND r2.answer - r1.answer &lt; 6 * 60 * 60 * 1000
@@ -600,4 +605,15 @@
         AND p.rec_status = 0
         AND o.rec_status = 0
     </select>
+
+    <select id="queryDiseaseTime" resultType="java.lang.Long">
+        SELECT
+            answer
+        FROM
+            t_qcp_first_aid_record AS r
+        WHERE
+            rec_status = 0
+        AND first_aid_id = #{firstAidId}
+        AND question_code = 'JBXX-FBSJ'
+    </select>
 </mapper>

src/main/resources/mapper_dao/OcrKeywordDao.xml

@@ -0,0 +1,41 @@
+<?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.ccsens.carbasics.persist.dao.OcrKeywordDao">
+
+    <select id="queryByHospital" resultType="com.ccsens.carbasics.bean.po.OcrKeyword">
+        SELECT
+            id,
+            `code`,
+            `option`,
+            keyword,
+            keyword_exclude,
+            verify_type,
+            query_rule,
+            organization_id
+        FROM
+            t_qcp_ocr_keyword AS k
+        WHERE
+            rec_status = 0
+        AND k.organization_id = 0
+    </select>
+
+    <select id="queryDischargeTime" resultType="com.ccsens.carbasics.bean.po.OcrKeyword">
+        SELECT
+            id,
+            `code`,
+            `option`,
+            keyword,
+            keyword_exclude,
+            verify_type,
+            query_rule,
+            organization_id
+        FROM
+            t_qcp_ocr_keyword AS k
+        WHERE
+            rec_status = 0
+        AND k.organization_id = 0
+        AND keyword = '出院时间'
+        LIMIT 1
+    </select>
+
+</mapper>

src/main/resources/mapper_dao/OcrKeywordOptionDao.xml

@@ -0,0 +1,18 @@
+<?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.ccsens.carbasics.persist.dao.OcrKeywordOptionDao">
+
+
+    <select id="queryByKeyId" resultType="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+        SELECT
+            id,
+            `code`,
+            answer,
+            keyword_id
+        FROM
+            t_qcp_ocr_keyword_option AS ko
+        WHERE
+            rec_status = 0
+        AND ko.keyword_id = #{keyId}
+    </select>
+</mapper>

src/main/resources/mapper_dao/OrganizationDao.xml

@@ -1,6 +1,18 @@
 <?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.ccsens.carbasics.persist.dao.OrganizationDao">
+    <insert id="batchInsert">
+        replace into t_organization(id, organization_type, code, name, short_name, introduce, level, operator) value
+        <foreach collection="organizations" item="item" separator=",">
+            (#{item.id}, #{item.organizationType}, #{item.code}, #{item.name}, #{item.shortName}, #{item.introduce}, #{item.level}, #{item.operator})
+        </foreach>
+    </insert>
+    <insert id="batchInsertParent">
+        replace into t_organization_parent(id, organization_id, parent_id, operator) value
+        <foreach collection="parents" item="item" separator=",">
+            (#{item.id}, #{item.organizationId}, #{item.parentId}, #{item.operator})
+        </foreach>
+    </insert>
 
     <select id="getOrganization" resultType="com.ccsens.carbasics.bean.vo.OrganizationVo$Basic">
         SELECT
@@ -88,7 +100,6 @@
         LIMIT 1
     </select>
     <select id="rankByType" resultType="com.ccsens.carbasics.bean.vo.OrganizationVo$RankItem">
-        select rank.*, @rank := @rank + 1 as rank  from (
         select h.id, h.name, h.level, ifNULL(t.total, 0) as value  from
         (
         <choose>
@@ -105,7 +116,7 @@
                 WHERE
                 organization_type = 3
                 <if test="level != null">
-                    AND level = 3
+                    AND level = #{level}
                 </if>
             </when>
             <otherwise>
@@ -124,14 +135,19 @@
                 IF( find_in_set( parent_id, @pids ) &gt; 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
                 FROM
                 ( SELECT t.*, p.parent_id FROM t_organization t, t_organization_parent p WHERE t.id = p.organization_id ORDER BY parent_id, id ) t1,
-                ( SELECT @pids := 2 ) t2
+                <choose>
+                    <when test="areaId == null">( SELECT @pids := 0 ) t2</when>
+                    <otherwise>( SELECT @pids := #{areaId} ) t2</otherwise>
+                </choose>
                 ) t3
                 WHERE
-                ischild != 0
+                organizationType = 3
+                <if test="areaId != null">
+                    and ischild != 0
+                </if>
                 <if test="level != null">
-                    AND level = 3
+                    AND level = #{level}
                 </if>
-                AND organizationType = 3
             </otherwise>
         </choose>
         ) h
@@ -139,8 +155,8 @@
         <choose>
             <when test="type == 0">
                 select a.hospital_id, count(*) as total from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
-                where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBSJ'
+                where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBTime'
-                and a.id = r2.first_aid_id and r1.question_code = 'JBXX-DYSJ'
+                and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
                 and r2.answer - r1.answer &gt; 6 * 60 * 60 * 1000
                 and a.rec_status = 0 and r1.rec_status = 0 and r2.rec_status = 0
                 group by a.hospital_id
@@ -157,8 +173,8 @@
                 (select
                 a.hospital_id,
                 count(*) as total from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
-                where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBSJ'
+                where a.id = r1.first_aid_id and r1.question_code = 'JBXX-FBTime'
-                and a.id = r2.first_aid_id and r1.question_code = 'JBXX-DYSJ'
+                and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
                 and r2.answer - r1.answer &lt; 6 * 60 * 60 * 1000
                 and a.rec_status = 0 and r1.rec_status = 0 and r2.rec_status = 0
                 group by a.hospital_id
@@ -181,12 +197,10 @@
         </choose>
 
         ) t on t.hospital_id = h.id
-        ) rank, (SELECT @rank:= 0) b
+        order by t.total desc
-        order by value
     </select>
 
     <select id="rankByDntMedian" resultType="com.ccsens.carbasics.bean.vo.OrganizationVo$RankItem">
-        select rank.*, @rank := @rank + 1 as rank  from (
         select h.id, h.name, h.level, ifNULL(t.total, 0) as value  from (
         <choose>
             <when test="areaId == null or areaId == 0">
@@ -202,7 +216,7 @@
                 WHERE
                 organization_type = 3
                 <if test="level != null">
-                    AND level = 3
+                    AND level = #{level}
                 </if>
             </when>
             <otherwise>
@@ -221,14 +235,22 @@
                 IF( find_in_set( parent_id, @pids ) &gt; 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
                 FROM
                 ( SELECT t.*, p.parent_id FROM t_organization t, t_organization_parent p WHERE t.id = p.organization_id ORDER BY parent_id, id ) t1,
-                ( SELECT @pids := 2 ) t2
+                <choose>
+                    <when test="areaId == null">( SELECT @pids := 0 ) t2</when>
+                    <otherwise>( SELECT @pids := #{areaId} ) t2</otherwise>
+                </choose>
+
                 ) t3
                 WHERE
-                ischild != 0
+                organizationType = 3
+                <if test="areaId != null">
+                    and ischild != 0
+                </if>
+
                 <if test="level != null">
-                    AND level = 3
+                    AND level = #{level}
                 </if>
-                AND organizationType = 3
+
             </otherwise>
         </choose>
         ) h
@@ -261,8 +283,10 @@
         where t1.rk IN (t2.cnt + 0.5, t2.cnt, t2.cnt + 1)
         group by t1.hospital_id
 		) t on t.hospital_id = h.id
-        ) rank, (SELECT @rank:= 0) b
+        order by t.total desc
-        order by value
+    </select>
+    <select id="getOrganizationByName" resultType="com.ccsens.carbasics.bean.po.Organization">
+        select * from t_organization where name = #{name} and rec_status = 0 order by updated_at desc limit 1
     </select>
 
 </mapper>

src/main/resources/mapper_dao/OrganizationMemberDao.xml

@@ -28,4 +28,25 @@
         and d.rec_status = 0
         and o.rec_status = 0
     </select>
+    <select id="getHospital" resultType="com.ccsens.carbasics.bean.vo.OrganizationMemberVo$Organization">
+        SELECT
+        o.id ,
+        o.name,
+        p.project_id as projectId
+        FROM
+        t_organization_member m,
+        t_organization_department d,
+        t_organization o,
+        t_organization_project p
+        WHERE
+        m.user_id = #{userId}
+        and m.department_id = d.id
+        and d.organization_id = o.id
+        and o.id = p.organization_id
+        and m.rec_status = 0
+        and d.rec_status = 0
+        and o.rec_status = 0
+        and p.rec_status = 0
+        limit 1
+    </select>
 </mapper>

src/main/resources/mapper_dao/QuestionnaireDao.xml

@@ -0,0 +1,147 @@
+<?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.ccsens.carbasics.persist.dao.QuestionnaireDao">
+    
+    <resultMap id="questionnaire" type="com.ccsens.carbasics.bean.vo.QuestionnaireVo$QuestionnaireInfo">
+        <id column="id" property="id"/>
+        <result column="questionnaire_name" property="questionnaireName"/>
+        <result column="start" property="start"/>
+        <result column="end" property="end"/>
+        <result column="type" property="type"/>
+        <collection property="detail" ofType="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+            <result column="city" property="city"/>
+            <result column="county" property="county"/>
+            <result column="hospital_level" property="hospitalLevel"/>
+            <result column="hospital_name" property="hospitalName"/>
+            <result column="departments" property="departments"/>
+            <result column="name" property="name"/>
+            <result column="phone" property="phone"/>
+            <result column="advanced_stroke_center" property="advancedStrokeCenter"/>
+            <result column="stroke_center" property="strokeCenter"/>
+            <result column="map_hospital" property="mapHospital"/>
+            <result column="stroke_number" property="strokeNumber"/>
+            <result column="ais_number_four" property="aisNumberFour"/>
+            <result column="jmrs_number_four" property="jmrsNumberFour"/>
+            <result column="rtpa_number" property="rtpaNumber"/>
+            <result column="dnt_number" property="dntNumber"/>
+            <result column="dnt_number_four" property="dntNumberFour"/>
+            <result column="dnt_number_six" property="dntNumberSix"/>
+            <result column="sich_number" property="sichNumber"/>
+            <result column="jmrs_number_one" property="jmrsNumberOne"/>
+            <result column="ais_number_six" property="aisNumberSix"/>
+            <result column="should_directly" property="shouldDirectly"/>
+            <result column="dpt_median_number" property="dptMedianNumber"/>
+            <result column="prt_median_number" property="prtMedianNumber"/>
+            <result column="jmrs_number_two" property="jmrsNumberTwo"/>
+            <result column="death_number" property="deathNumber"/>
+        </collection>
+    </resultMap>
+    
+    <select id="queryQuestionnaire" resultMap="questionnaire">
+        SELECT
+            q.id,
+            q.questionnaire_name AS questionnaire_name,
+            q.start_time AS `start`,
+            q.end_time AS `end`,
+            q.type,
+            qd.city,
+            qd.county,
+            qd.hospital_level,
+            qd.hospital_name,
+            qd.departments,
+            qd.`name`,
+            qd.phone,
+            qd.advanced_stroke_center,
+            qd.stroke_center,
+            qd.map_hospital,
+            qd.stroke_number,
+            qd.ais_number_four,
+            qd.jmrs_number_four,
+            qd.rtpa_number,
+            qd.dnt_number,
+            qd.dnt_number_four,
+            qd.dnt_number_six,
+            qd.sich_number,
+            qd.jmrs_number_one,
+            qd.ais_number_six,
+            qd.should_directly,
+            qd.dpt_median_number,
+            qd.prt_median_number,
+            qd.jmrs_number_two,
+            qd.death_number
+        FROM
+            t_qcp_questionnaire AS q
+            LEFT JOIN t_qcp_questionnaire_detail AS qd ON q.id = qd.questionnaire_id
+        AND qd.user_id = #{userId} AND qd.rec_status = 0
+        WHERE
+            q.write_start_time &lt; #{time}
+            AND q.write_end_time &gt; #{time}
+            AND type = #{type}
+            AND q.rec_status = 0
+    </select>
+
+    <select id="queryNotWrite" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$WriteStatus">
+        SELECT
+            q.id,
+            q.questionnaire_name,
+            q.start_time AS `start`,
+            q.end_time AS `end`,
+            q.type,
+            q.write_start_time,
+            q.write_end_time,
+            qd.id AS detailId
+        FROM
+            t_qcp_questionnaire AS q
+            LEFT JOIN t_qcp_questionnaire_detail AS qd ON q.id = qd.questionnaire_id
+        AND qd.hospital_name = #{name} AND qd.rec_status = 0
+        WHERE
+            q.write_start_time &lt; #{time}
+            AND q.write_end_time &gt; #{time}
+            AND q.rec_status = 0
+    </select>
+
+    <select id="queryRepeat" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$QuestionnaireInfo">
+        SELECT
+            q.id,
+            q.questionnaire_name AS questionnaire_name,
+            q.start_time AS `start`,
+            q.end_time AS `end`,
+            q.type,
+            qd.city,
+            qd.county,
+            qd.hospital_level,
+            qd.hospital_name,
+            qd.departments,
+            qd.`name`,
+            qd.phone,
+            qd.advanced_stroke_center,
+            qd.stroke_center,
+            qd.map_hospital,
+            qd.stroke_number,
+            qd.ais_number_four,
+            qd.jmrs_number_four,
+            qd.rtpa_number,
+            qd.dnt_number,
+            qd.dnt_number_four,
+            qd.dnt_number_six,
+            qd.sich_number,
+            qd.jmrs_number_one,
+            qd.ais_number_six,
+            qd.should_directly,
+            qd.dpt_median_number,
+            qd.prt_median_number,
+            qd.jmrs_number_two,
+            qd.death_number
+        FROM
+            t_qcp_questionnaire AS q
+            LEFT JOIN t_qcp_questionnaire_detail AS qd ON q.id = qd.questionnaire_id
+        AND qd.user_id = #{name} AND qd.rec_status = 0
+        WHERE
+            q.write_start_time &lt; #{time}
+            AND q.write_end_time &gt; #{time}
+            AND type = #{type}
+            AND q.rec_status = 0
+    </select>
+
+
+</mapper>

src/main/resources/mapper_dao/QuestionnaireDetailDao.xml

@@ -0,0 +1,6 @@
+<?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.ccsens.carbasics.persist.dao.QuestionnaireDetailDao">
+
+
+</mapper>

src/main/resources/mapper_raw/AreaMapper.xml

@@ -0,0 +1,323 @@
+<?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.ccsens.carbasics.persist.mapper.AreaMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.Area">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="area_name" jdbcType="VARCHAR" property="areaName" />
+    <result column="area_code" jdbcType="VARCHAR" property="areaCode" />
+    <result column="area_short" jdbcType="VARCHAR" property="areaShort" />
+    <result column="area_status" jdbcType="TINYINT" property="areaStatus" />
+    <result column="area_parent_id" jdbcType="INTEGER" property="areaParentId" />
+    <result column="init_date" jdbcType="TIMESTAMP" property="initDate" />
+    <result column="init_addr" jdbcType="VARCHAR" property="initAddr" />
+    <result column="area_type" jdbcType="TINYINT" property="areaType" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, area_name, area_code, area_short, area_status, area_parent_id, init_date, init_addr, 
+    area_type, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.AreaExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_area
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_area
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from t_area
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.AreaExample">
+    delete from t_area
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.Area">
+    insert into t_area (id, area_name, area_code, 
+      area_short, area_status, area_parent_id, 
+      init_date, init_addr, area_type, 
+      created_at, updated_at, rec_status
+      )
+    values (#{id,jdbcType=INTEGER}, #{areaName,jdbcType=VARCHAR}, #{areaCode,jdbcType=VARCHAR}, 
+      #{areaShort,jdbcType=VARCHAR}, #{areaStatus,jdbcType=TINYINT}, #{areaParentId,jdbcType=INTEGER}, 
+      #{initDate,jdbcType=TIMESTAMP}, #{initAddr,jdbcType=VARCHAR}, #{areaType,jdbcType=TINYINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.Area">
+    insert into t_area
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="areaName != null">
+        area_name,
+      </if>
+      <if test="areaCode != null">
+        area_code,
+      </if>
+      <if test="areaShort != null">
+        area_short,
+      </if>
+      <if test="areaStatus != null">
+        area_status,
+      </if>
+      <if test="areaParentId != null">
+        area_parent_id,
+      </if>
+      <if test="initDate != null">
+        init_date,
+      </if>
+      <if test="initAddr != null">
+        init_addr,
+      </if>
+      <if test="areaType != null">
+        area_type,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="areaName != null">
+        #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="areaCode != null">
+        #{areaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="areaShort != null">
+        #{areaShort,jdbcType=VARCHAR},
+      </if>
+      <if test="areaStatus != null">
+        #{areaStatus,jdbcType=TINYINT},
+      </if>
+      <if test="areaParentId != null">
+        #{areaParentId,jdbcType=INTEGER},
+      </if>
+      <if test="initDate != null">
+        #{initDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="initAddr != null">
+        #{initAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="areaType != null">
+        #{areaType,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.AreaExample" resultType="java.lang.Long">
+    select count(*) from t_area
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_area
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.areaName != null">
+        area_name = #{record.areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.areaCode != null">
+        area_code = #{record.areaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.areaShort != null">
+        area_short = #{record.areaShort,jdbcType=VARCHAR},
+      </if>
+      <if test="record.areaStatus != null">
+        area_status = #{record.areaStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.areaParentId != null">
+        area_parent_id = #{record.areaParentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.initDate != null">
+        init_date = #{record.initDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.initAddr != null">
+        init_addr = #{record.initAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.areaType != null">
+        area_type = #{record.areaType,jdbcType=TINYINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_area
+    set id = #{record.id,jdbcType=INTEGER},
+      area_name = #{record.areaName,jdbcType=VARCHAR},
+      area_code = #{record.areaCode,jdbcType=VARCHAR},
+      area_short = #{record.areaShort,jdbcType=VARCHAR},
+      area_status = #{record.areaStatus,jdbcType=TINYINT},
+      area_parent_id = #{record.areaParentId,jdbcType=INTEGER},
+      init_date = #{record.initDate,jdbcType=TIMESTAMP},
+      init_addr = #{record.initAddr,jdbcType=VARCHAR},
+      area_type = #{record.areaType,jdbcType=TINYINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.Area">
+    update t_area
+    <set>
+      <if test="areaName != null">
+        area_name = #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="areaCode != null">
+        area_code = #{areaCode,jdbcType=VARCHAR},
+      </if>
+      <if test="areaShort != null">
+        area_short = #{areaShort,jdbcType=VARCHAR},
+      </if>
+      <if test="areaStatus != null">
+        area_status = #{areaStatus,jdbcType=TINYINT},
+      </if>
+      <if test="areaParentId != null">
+        area_parent_id = #{areaParentId,jdbcType=INTEGER},
+      </if>
+      <if test="initDate != null">
+        init_date = #{initDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="initAddr != null">
+        init_addr = #{initAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="areaType != null">
+        area_type = #{areaType,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.Area">
+    update t_area
+    set area_name = #{areaName,jdbcType=VARCHAR},
+      area_code = #{areaCode,jdbcType=VARCHAR},
+      area_short = #{areaShort,jdbcType=VARCHAR},
+      area_status = #{areaStatus,jdbcType=TINYINT},
+      area_parent_id = #{areaParentId,jdbcType=INTEGER},
+      init_date = #{initDate,jdbcType=TIMESTAMP},
+      init_addr = #{initAddr,jdbcType=VARCHAR},
+      area_type = #{areaType,jdbcType=TINYINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/resources/mapper_raw/FirstAidMapper.xml

@@ -15,6 +15,7 @@
     <result column="data_status" jdbcType="TINYINT" property="dataStatus" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
     <result column="hospital_id" jdbcType="BIGINT" property="hospitalId" />
+    <result column="reported" jdbcType="TINYINT" property="reported" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -80,7 +81,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, gender, age, nation, idcard, phone, type, value_type, save_type, data_status, 
-    project_id, hospital_id, operator, created_at, updated_at, rec_status
+    project_id, hospital_id, reported, operator, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.FirstAidExample" resultMap="BaseResultMap">
     select
@@ -117,14 +118,16 @@
       age, nation, idcard, 
       phone, type, value_type, 
       save_type, data_status, project_id, 
-      hospital_id, operator, created_at, 
+      hospital_id, reported, operator, 
-      updated_at, rec_status)
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
       #{age,jdbcType=INTEGER}, #{nation,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, #{valueType,jdbcType=TINYINT}, 
       #{saveType,jdbcType=TINYINT}, #{dataStatus,jdbcType=TINYINT}, #{projectId,jdbcType=BIGINT}, 
-      #{hospitalId,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{hospitalId,jdbcType=BIGINT}, #{reported,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.FirstAid">
     insert into t_qcp_first_aid
@@ -168,6 +171,9 @@
       <if test="hospitalId != null">
         hospital_id,
       </if>
+      <if test="reported != null">
+        reported,
+      </if>
       <if test="operator != null">
         operator,
       </if>
@@ -221,6 +227,9 @@
       <if test="hospitalId != null">
         #{hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="reported != null">
+        #{reported,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         #{operator,jdbcType=BIGINT},
       </if>
@@ -283,6 +292,9 @@
       <if test="record.hospitalId != null">
         hospital_id = #{record.hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="record.reported != null">
+        reported = #{record.reported,jdbcType=TINYINT},
+      </if>
       <if test="record.operator != null">
         operator = #{record.operator,jdbcType=BIGINT},
       </if>
@@ -315,6 +327,7 @@
       data_status = #{record.dataStatus,jdbcType=TINYINT},
       project_id = #{record.projectId,jdbcType=BIGINT},
       hospital_id = #{record.hospitalId,jdbcType=BIGINT},
+      reported = #{record.reported,jdbcType=TINYINT},
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -362,6 +375,9 @@
       <if test="hospitalId != null">
         hospital_id = #{hospitalId,jdbcType=BIGINT},
       </if>
+      <if test="reported != null">
+        reported = #{reported,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         operator = #{operator,jdbcType=BIGINT},
       </if>
@@ -391,6 +407,7 @@
       data_status = #{dataStatus,jdbcType=TINYINT},
       project_id = #{projectId,jdbcType=BIGINT},
       hospital_id = #{hospitalId,jdbcType=BIGINT},
+      reported = #{reported,jdbcType=TINYINT},
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},

src/main/resources/mapper_raw/OcrKeywordMapper.xml

@@ -0,0 +1,306 @@
+<?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.ccsens.carbasics.persist.mapper.OcrKeywordMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.OcrKeyword">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="option" jdbcType="VARCHAR" property="option" />
+    <result column="keyword" jdbcType="VARCHAR" property="keyword" />
+    <result column="keyword_exclude" jdbcType="VARCHAR" property="keywordExclude" />
+    <result column="verify_type" jdbcType="TINYINT" property="verifyType" />
+    <result column="query_rule" jdbcType="VARCHAR" property="queryRule" />
+    <result column="organization_id" jdbcType="BIGINT" property="organizationId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, code, option, keyword, keyword_exclude, verify_type, query_rule, organization_id, 
+    created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_qcp_ocr_keyword
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_qcp_ocr_keyword
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_qcp_ocr_keyword
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordExample">
+    delete from t_qcp_ocr_keyword
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.OcrKeyword">
+    insert into t_qcp_ocr_keyword (id, code, option, 
+      keyword, keyword_exclude, verify_type, 
+      query_rule, organization_id, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{option,jdbcType=VARCHAR}, 
+      #{keyword,jdbcType=VARCHAR}, #{keywordExclude,jdbcType=VARCHAR}, #{verifyType,jdbcType=TINYINT}, 
+      #{queryRule,jdbcType=VARCHAR}, #{organizationId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.OcrKeyword">
+    insert into t_qcp_ocr_keyword
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="option != null">
+        option,
+      </if>
+      <if test="keyword != null">
+        keyword,
+      </if>
+      <if test="keywordExclude != null">
+        keyword_exclude,
+      </if>
+      <if test="verifyType != null">
+        verify_type,
+      </if>
+      <if test="queryRule != null">
+        query_rule,
+      </if>
+      <if test="organizationId != null">
+        organization_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="option != null">
+        #{option,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        #{keyword,jdbcType=VARCHAR},
+      </if>
+      <if test="keywordExclude != null">
+        #{keywordExclude,jdbcType=VARCHAR},
+      </if>
+      <if test="verifyType != null">
+        #{verifyType,jdbcType=TINYINT},
+      </if>
+      <if test="queryRule != null">
+        #{queryRule,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordExample" resultType="java.lang.Long">
+    select count(*) from t_qcp_ocr_keyword
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_qcp_ocr_keyword
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.option != null">
+        option = #{record.option,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keyword != null">
+        keyword = #{record.keyword,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keywordExclude != null">
+        keyword_exclude = #{record.keywordExclude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.verifyType != null">
+        verify_type = #{record.verifyType,jdbcType=TINYINT},
+      </if>
+      <if test="record.queryRule != null">
+        query_rule = #{record.queryRule,jdbcType=VARCHAR},
+      </if>
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_qcp_ocr_keyword
+    set id = #{record.id,jdbcType=BIGINT},
+      code = #{record.code,jdbcType=VARCHAR},
+      option = #{record.option,jdbcType=VARCHAR},
+      keyword = #{record.keyword,jdbcType=VARCHAR},
+      keyword_exclude = #{record.keywordExclude,jdbcType=VARCHAR},
+      verify_type = #{record.verifyType,jdbcType=TINYINT},
+      query_rule = #{record.queryRule,jdbcType=VARCHAR},
+      organization_id = #{record.organizationId,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.OcrKeyword">
+    update t_qcp_ocr_keyword
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="option != null">
+        option = #{option,jdbcType=VARCHAR},
+      </if>
+      <if test="keyword != null">
+        keyword = #{keyword,jdbcType=VARCHAR},
+      </if>
+      <if test="keywordExclude != null">
+        keyword_exclude = #{keywordExclude,jdbcType=VARCHAR},
+      </if>
+      <if test="verifyType != null">
+        verify_type = #{verifyType,jdbcType=TINYINT},
+      </if>
+      <if test="queryRule != null">
+        query_rule = #{queryRule,jdbcType=VARCHAR},
+      </if>
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.OcrKeyword">
+    update t_qcp_ocr_keyword
+    set code = #{code,jdbcType=VARCHAR},
+      option = #{option,jdbcType=VARCHAR},
+      keyword = #{keyword,jdbcType=VARCHAR},
+      keyword_exclude = #{keywordExclude,jdbcType=VARCHAR},
+      verify_type = #{verifyType,jdbcType=TINYINT},
+      query_rule = #{queryRule,jdbcType=VARCHAR},
+      organization_id = #{organizationId,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mapper_raw/OcrKeywordOptionMapper.xml

@@ -0,0 +1,243 @@
+<?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.ccsens.carbasics.persist.mapper.OcrKeywordOptionMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="answer" jdbcType="VARCHAR" property="answer" />
+    <result column="keyword_id" jdbcType="BIGINT" property="keywordId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, code, answer, keyword_id, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOptionExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_qcp_ocr_keyword_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_qcp_ocr_keyword_option
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_qcp_ocr_keyword_option
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOptionExample">
+    delete from t_qcp_ocr_keyword_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+    insert into t_qcp_ocr_keyword_option (id, code, answer, 
+      keyword_id, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{answer,jdbcType=VARCHAR}, 
+      #{keywordId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+    insert into t_qcp_ocr_keyword_option
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="code != null">
+        code,
+      </if>
+      <if test="answer != null">
+        answer,
+      </if>
+      <if test="keywordId != null">
+        keyword_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="answer != null">
+        #{answer,jdbcType=VARCHAR},
+      </if>
+      <if test="keywordId != null">
+        #{keywordId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOptionExample" resultType="java.lang.Long">
+    select count(*) from t_qcp_ocr_keyword_option
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_qcp_ocr_keyword_option
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.code != null">
+        code = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.answer != null">
+        answer = #{record.answer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keywordId != null">
+        keyword_id = #{record.keywordId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_qcp_ocr_keyword_option
+    set id = #{record.id,jdbcType=BIGINT},
+      code = #{record.code,jdbcType=VARCHAR},
+      answer = #{record.answer,jdbcType=VARCHAR},
+      keyword_id = #{record.keywordId,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+    update t_qcp_ocr_keyword_option
+    <set>
+      <if test="code != null">
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="answer != null">
+        answer = #{answer,jdbcType=VARCHAR},
+      </if>
+      <if test="keywordId != null">
+        keyword_id = #{keywordId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.OcrKeywordOption">
+    update t_qcp_ocr_keyword_option
+    set code = #{code,jdbcType=VARCHAR},
+      answer = #{answer,jdbcType=VARCHAR},
+      keyword_id = #{keywordId,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mapper_raw/QuestionnaireDetailMapper.xml

@@ -0,0 +1,623 @@
+<?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.ccsens.carbasics.persist.mapper.QuestionnaireDetailMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="city" jdbcType="VARCHAR" property="city" />
+    <result column="county" jdbcType="VARCHAR" property="county" />
+    <result column="hospital_level" jdbcType="TINYINT" property="hospitalLevel" />
+    <result column="hospital_name" jdbcType="VARCHAR" property="hospitalName" />
+    <result column="departments" jdbcType="VARCHAR" property="departments" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="advanced_stroke_center" jdbcType="TINYINT" property="advancedStrokeCenter" />
+    <result column="stroke_center" jdbcType="TINYINT" property="strokeCenter" />
+    <result column="map_hospital" jdbcType="TINYINT" property="mapHospital" />
+    <result column="stroke_number" jdbcType="INTEGER" property="strokeNumber" />
+    <result column="ais_number_four" jdbcType="INTEGER" property="aisNumberFour" />
+    <result column="jmrs_number_four" jdbcType="INTEGER" property="jmrsNumberFour" />
+    <result column="rtpa_number" jdbcType="INTEGER" property="rtpaNumber" />
+    <result column="dnt_number" jdbcType="INTEGER" property="dntNumber" />
+    <result column="dnt_number_four" jdbcType="INTEGER" property="dntNumberFour" />
+    <result column="dnt_number_six" jdbcType="INTEGER" property="dntNumberSix" />
+    <result column="sich_number" jdbcType="INTEGER" property="sichNumber" />
+    <result column="jmrs_number_one" jdbcType="INTEGER" property="jmrsNumberOne" />
+    <result column="ais_number_six" jdbcType="INTEGER" property="aisNumberSix" />
+    <result column="should_directly" jdbcType="INTEGER" property="shouldDirectly" />
+    <result column="dpt_median_number" jdbcType="INTEGER" property="dptMedianNumber" />
+    <result column="prt_median_number" jdbcType="INTEGER" property="prtMedianNumber" />
+    <result column="jmrs_number_two" jdbcType="INTEGER" property="jmrsNumberTwo" />
+    <result column="death_number" jdbcType="INTEGER" property="deathNumber" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="questionnaire_id" jdbcType="BIGINT" property="questionnaireId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, city, county, hospital_level, hospital_name, departments, name, phone, advanced_stroke_center, 
+    stroke_center, map_hospital, stroke_number, ais_number_four, jmrs_number_four, rtpa_number, 
+    dnt_number, dnt_number_four, dnt_number_six, sich_number, jmrs_number_one, ais_number_six, 
+    should_directly, dpt_median_number, prt_median_number, jmrs_number_two, death_number, 
+    user_id, questionnaire_id, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetailExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_qcp_questionnaire_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_qcp_questionnaire_detail
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_qcp_questionnaire_detail
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetailExample">
+    delete from t_qcp_questionnaire_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+    insert into t_qcp_questionnaire_detail (id, city, county, 
+      hospital_level, hospital_name, departments, 
+      name, phone, advanced_stroke_center, 
+      stroke_center, map_hospital, stroke_number, 
+      ais_number_four, jmrs_number_four, rtpa_number, 
+      dnt_number, dnt_number_four, dnt_number_six, 
+      sich_number, jmrs_number_one, ais_number_six, 
+      should_directly, dpt_median_number, prt_median_number, 
+      jmrs_number_two, death_number, user_id, 
+      questionnaire_id, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{city,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, 
+      #{hospitalLevel,jdbcType=TINYINT}, #{hospitalName,jdbcType=VARCHAR}, #{departments,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{advancedStrokeCenter,jdbcType=TINYINT}, 
+      #{strokeCenter,jdbcType=TINYINT}, #{mapHospital,jdbcType=TINYINT}, #{strokeNumber,jdbcType=INTEGER}, 
+      #{aisNumberFour,jdbcType=INTEGER}, #{jmrsNumberFour,jdbcType=INTEGER}, #{rtpaNumber,jdbcType=INTEGER}, 
+      #{dntNumber,jdbcType=INTEGER}, #{dntNumberFour,jdbcType=INTEGER}, #{dntNumberSix,jdbcType=INTEGER}, 
+      #{sichNumber,jdbcType=INTEGER}, #{jmrsNumberOne,jdbcType=INTEGER}, #{aisNumberSix,jdbcType=INTEGER}, 
+      #{shouldDirectly,jdbcType=INTEGER}, #{dptMedianNumber,jdbcType=INTEGER}, #{prtMedianNumber,jdbcType=INTEGER}, 
+      #{jmrsNumberTwo,jdbcType=INTEGER}, #{deathNumber,jdbcType=INTEGER}, #{userId,jdbcType=BIGINT}, 
+      #{questionnaireId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+    insert into t_qcp_questionnaire_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="county != null">
+        county,
+      </if>
+      <if test="hospitalLevel != null">
+        hospital_level,
+      </if>
+      <if test="hospitalName != null">
+        hospital_name,
+      </if>
+      <if test="departments != null">
+        departments,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="phone != null">
+        phone,
+      </if>
+      <if test="advancedStrokeCenter != null">
+        advanced_stroke_center,
+      </if>
+      <if test="strokeCenter != null">
+        stroke_center,
+      </if>
+      <if test="mapHospital != null">
+        map_hospital,
+      </if>
+      <if test="strokeNumber != null">
+        stroke_number,
+      </if>
+      <if test="aisNumberFour != null">
+        ais_number_four,
+      </if>
+      <if test="jmrsNumberFour != null">
+        jmrs_number_four,
+      </if>
+      <if test="rtpaNumber != null">
+        rtpa_number,
+      </if>
+      <if test="dntNumber != null">
+        dnt_number,
+      </if>
+      <if test="dntNumberFour != null">
+        dnt_number_four,
+      </if>
+      <if test="dntNumberSix != null">
+        dnt_number_six,
+      </if>
+      <if test="sichNumber != null">
+        sich_number,
+      </if>
+      <if test="jmrsNumberOne != null">
+        jmrs_number_one,
+      </if>
+      <if test="aisNumberSix != null">
+        ais_number_six,
+      </if>
+      <if test="shouldDirectly != null">
+        should_directly,
+      </if>
+      <if test="dptMedianNumber != null">
+        dpt_median_number,
+      </if>
+      <if test="prtMedianNumber != null">
+        prt_median_number,
+      </if>
+      <if test="jmrsNumberTwo != null">
+        jmrs_number_two,
+      </if>
+      <if test="deathNumber != null">
+        death_number,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="questionnaireId != null">
+        questionnaire_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="hospitalLevel != null">
+        #{hospitalLevel,jdbcType=TINYINT},
+      </if>
+      <if test="hospitalName != null">
+        #{hospitalName,jdbcType=VARCHAR},
+      </if>
+      <if test="departments != null">
+        #{departments,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="advancedStrokeCenter != null">
+        #{advancedStrokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="strokeCenter != null">
+        #{strokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="mapHospital != null">
+        #{mapHospital,jdbcType=TINYINT},
+      </if>
+      <if test="strokeNumber != null">
+        #{strokeNumber,jdbcType=INTEGER},
+      </if>
+      <if test="aisNumberFour != null">
+        #{aisNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberFour != null">
+        #{jmrsNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="rtpaNumber != null">
+        #{rtpaNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumber != null">
+        #{dntNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumberFour != null">
+        #{dntNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumberSix != null">
+        #{dntNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="sichNumber != null">
+        #{sichNumber,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberOne != null">
+        #{jmrsNumberOne,jdbcType=INTEGER},
+      </if>
+      <if test="aisNumberSix != null">
+        #{aisNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="shouldDirectly != null">
+        #{shouldDirectly,jdbcType=INTEGER},
+      </if>
+      <if test="dptMedianNumber != null">
+        #{dptMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="prtMedianNumber != null">
+        #{prtMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberTwo != null">
+        #{jmrsNumberTwo,jdbcType=INTEGER},
+      </if>
+      <if test="deathNumber != null">
+        #{deathNumber,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="questionnaireId != null">
+        #{questionnaireId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetailExample" resultType="java.lang.Long">
+    select count(*) from t_qcp_questionnaire_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_qcp_questionnaire_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.county != null">
+        county = #{record.county,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hospitalLevel != null">
+        hospital_level = #{record.hospitalLevel,jdbcType=TINYINT},
+      </if>
+      <if test="record.hospitalName != null">
+        hospital_name = #{record.hospitalName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.departments != null">
+        departments = #{record.departments,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null">
+        phone = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.advancedStrokeCenter != null">
+        advanced_stroke_center = #{record.advancedStrokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="record.strokeCenter != null">
+        stroke_center = #{record.strokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="record.mapHospital != null">
+        map_hospital = #{record.mapHospital,jdbcType=TINYINT},
+      </if>
+      <if test="record.strokeNumber != null">
+        stroke_number = #{record.strokeNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.aisNumberFour != null">
+        ais_number_four = #{record.aisNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="record.jmrsNumberFour != null">
+        jmrs_number_four = #{record.jmrsNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="record.rtpaNumber != null">
+        rtpa_number = #{record.rtpaNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.dntNumber != null">
+        dnt_number = #{record.dntNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.dntNumberFour != null">
+        dnt_number_four = #{record.dntNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="record.dntNumberSix != null">
+        dnt_number_six = #{record.dntNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="record.sichNumber != null">
+        sich_number = #{record.sichNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.jmrsNumberOne != null">
+        jmrs_number_one = #{record.jmrsNumberOne,jdbcType=INTEGER},
+      </if>
+      <if test="record.aisNumberSix != null">
+        ais_number_six = #{record.aisNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="record.shouldDirectly != null">
+        should_directly = #{record.shouldDirectly,jdbcType=INTEGER},
+      </if>
+      <if test="record.dptMedianNumber != null">
+        dpt_median_number = #{record.dptMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.prtMedianNumber != null">
+        prt_median_number = #{record.prtMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.jmrsNumberTwo != null">
+        jmrs_number_two = #{record.jmrsNumberTwo,jdbcType=INTEGER},
+      </if>
+      <if test="record.deathNumber != null">
+        death_number = #{record.deathNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
+      <if test="record.questionnaireId != null">
+        questionnaire_id = #{record.questionnaireId,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_qcp_questionnaire_detail
+    set id = #{record.id,jdbcType=BIGINT},
+      city = #{record.city,jdbcType=VARCHAR},
+      county = #{record.county,jdbcType=VARCHAR},
+      hospital_level = #{record.hospitalLevel,jdbcType=TINYINT},
+      hospital_name = #{record.hospitalName,jdbcType=VARCHAR},
+      departments = #{record.departments,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      advanced_stroke_center = #{record.advancedStrokeCenter,jdbcType=TINYINT},
+      stroke_center = #{record.strokeCenter,jdbcType=TINYINT},
+      map_hospital = #{record.mapHospital,jdbcType=TINYINT},
+      stroke_number = #{record.strokeNumber,jdbcType=INTEGER},
+      ais_number_four = #{record.aisNumberFour,jdbcType=INTEGER},
+      jmrs_number_four = #{record.jmrsNumberFour,jdbcType=INTEGER},
+      rtpa_number = #{record.rtpaNumber,jdbcType=INTEGER},
+      dnt_number = #{record.dntNumber,jdbcType=INTEGER},
+      dnt_number_four = #{record.dntNumberFour,jdbcType=INTEGER},
+      dnt_number_six = #{record.dntNumberSix,jdbcType=INTEGER},
+      sich_number = #{record.sichNumber,jdbcType=INTEGER},
+      jmrs_number_one = #{record.jmrsNumberOne,jdbcType=INTEGER},
+      ais_number_six = #{record.aisNumberSix,jdbcType=INTEGER},
+      should_directly = #{record.shouldDirectly,jdbcType=INTEGER},
+      dpt_median_number = #{record.dptMedianNumber,jdbcType=INTEGER},
+      prt_median_number = #{record.prtMedianNumber,jdbcType=INTEGER},
+      jmrs_number_two = #{record.jmrsNumberTwo,jdbcType=INTEGER},
+      death_number = #{record.deathNumber,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=BIGINT},
+      questionnaire_id = #{record.questionnaireId,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+    update t_qcp_questionnaire_detail
+    <set>
+      <if test="city != null">
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null">
+        county = #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="hospitalLevel != null">
+        hospital_level = #{hospitalLevel,jdbcType=TINYINT},
+      </if>
+      <if test="hospitalName != null">
+        hospital_name = #{hospitalName,jdbcType=VARCHAR},
+      </if>
+      <if test="departments != null">
+        departments = #{departments,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null">
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="advancedStrokeCenter != null">
+        advanced_stroke_center = #{advancedStrokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="strokeCenter != null">
+        stroke_center = #{strokeCenter,jdbcType=TINYINT},
+      </if>
+      <if test="mapHospital != null">
+        map_hospital = #{mapHospital,jdbcType=TINYINT},
+      </if>
+      <if test="strokeNumber != null">
+        stroke_number = #{strokeNumber,jdbcType=INTEGER},
+      </if>
+      <if test="aisNumberFour != null">
+        ais_number_four = #{aisNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberFour != null">
+        jmrs_number_four = #{jmrsNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="rtpaNumber != null">
+        rtpa_number = #{rtpaNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumber != null">
+        dnt_number = #{dntNumber,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumberFour != null">
+        dnt_number_four = #{dntNumberFour,jdbcType=INTEGER},
+      </if>
+      <if test="dntNumberSix != null">
+        dnt_number_six = #{dntNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="sichNumber != null">
+        sich_number = #{sichNumber,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberOne != null">
+        jmrs_number_one = #{jmrsNumberOne,jdbcType=INTEGER},
+      </if>
+      <if test="aisNumberSix != null">
+        ais_number_six = #{aisNumberSix,jdbcType=INTEGER},
+      </if>
+      <if test="shouldDirectly != null">
+        should_directly = #{shouldDirectly,jdbcType=INTEGER},
+      </if>
+      <if test="dptMedianNumber != null">
+        dpt_median_number = #{dptMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="prtMedianNumber != null">
+        prt_median_number = #{prtMedianNumber,jdbcType=INTEGER},
+      </if>
+      <if test="jmrsNumberTwo != null">
+        jmrs_number_two = #{jmrsNumberTwo,jdbcType=INTEGER},
+      </if>
+      <if test="deathNumber != null">
+        death_number = #{deathNumber,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="questionnaireId != null">
+        questionnaire_id = #{questionnaireId,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireDetail">
+    update t_qcp_questionnaire_detail
+    set city = #{city,jdbcType=VARCHAR},
+      county = #{county,jdbcType=VARCHAR},
+      hospital_level = #{hospitalLevel,jdbcType=TINYINT},
+      hospital_name = #{hospitalName,jdbcType=VARCHAR},
+      departments = #{departments,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      advanced_stroke_center = #{advancedStrokeCenter,jdbcType=TINYINT},
+      stroke_center = #{strokeCenter,jdbcType=TINYINT},
+      map_hospital = #{mapHospital,jdbcType=TINYINT},
+      stroke_number = #{strokeNumber,jdbcType=INTEGER},
+      ais_number_four = #{aisNumberFour,jdbcType=INTEGER},
+      jmrs_number_four = #{jmrsNumberFour,jdbcType=INTEGER},
+      rtpa_number = #{rtpaNumber,jdbcType=INTEGER},
+      dnt_number = #{dntNumber,jdbcType=INTEGER},
+      dnt_number_four = #{dntNumberFour,jdbcType=INTEGER},
+      dnt_number_six = #{dntNumberSix,jdbcType=INTEGER},
+      sich_number = #{sichNumber,jdbcType=INTEGER},
+      jmrs_number_one = #{jmrsNumberOne,jdbcType=INTEGER},
+      ais_number_six = #{aisNumberSix,jdbcType=INTEGER},
+      should_directly = #{shouldDirectly,jdbcType=INTEGER},
+      dpt_median_number = #{dptMedianNumber,jdbcType=INTEGER},
+      prt_median_number = #{prtMedianNumber,jdbcType=INTEGER},
+      jmrs_number_two = #{jmrsNumberTwo,jdbcType=INTEGER},
+      death_number = #{deathNumber,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=BIGINT},
+      questionnaire_id = #{questionnaireId,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mapper_raw/QuestionnaireMapper.xml

@@ -0,0 +1,291 @@
+<?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.ccsens.carbasics.persist.mapper.QuestionnaireMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.Questionnaire">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="questionnaire_name" jdbcType="VARCHAR" property="questionnaireName" />
+    <result column="start_time" jdbcType="BIGINT" property="startTime" />
+    <result column="end_time" jdbcType="BIGINT" property="endTime" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="write_start_time" jdbcType="BIGINT" property="writeStartTime" />
+    <result column="write_end_time" jdbcType="BIGINT" property="writeEndTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, questionnaire_name, start_time, end_time, type, created_at, updated_at, rec_status, 
+    write_start_time, write_end_time
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_qcp_questionnaire
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_qcp_questionnaire
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_qcp_questionnaire
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireExample">
+    delete from t_qcp_questionnaire
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.Questionnaire">
+    insert into t_qcp_questionnaire (id, questionnaire_name, start_time, 
+      end_time, type, created_at, 
+      updated_at, rec_status, write_start_time, 
+      write_end_time)
+    values (#{id,jdbcType=BIGINT}, #{questionnaireName,jdbcType=VARCHAR}, #{startTime,jdbcType=BIGINT}, 
+      #{endTime,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{writeStartTime,jdbcType=BIGINT}, 
+      #{writeEndTime,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.Questionnaire">
+    insert into t_qcp_questionnaire
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="questionnaireName != null">
+        questionnaire_name,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+      <if test="writeStartTime != null">
+        write_start_time,
+      </if>
+      <if test="writeEndTime != null">
+        write_end_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="questionnaireName != null">
+        #{questionnaireName,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=BIGINT},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="writeStartTime != null">
+        #{writeStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="writeEndTime != null">
+        #{writeEndTime,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.QuestionnaireExample" resultType="java.lang.Long">
+    select count(*) from t_qcp_questionnaire
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_qcp_questionnaire
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.questionnaireName != null">
+        questionnaire_name = #{record.questionnaireName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.writeStartTime != null">
+        write_start_time = #{record.writeStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.writeEndTime != null">
+        write_end_time = #{record.writeEndTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_qcp_questionnaire
+    set id = #{record.id,jdbcType=BIGINT},
+      questionnaire_name = #{record.questionnaireName,jdbcType=VARCHAR},
+      start_time = #{record.startTime,jdbcType=BIGINT},
+      end_time = #{record.endTime,jdbcType=BIGINT},
+      type = #{record.type,jdbcType=TINYINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      write_start_time = #{record.writeStartTime,jdbcType=BIGINT},
+      write_end_time = #{record.writeEndTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.Questionnaire">
+    update t_qcp_questionnaire
+    <set>
+      <if test="questionnaireName != null">
+        questionnaire_name = #{questionnaireName,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=BIGINT},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="writeStartTime != null">
+        write_start_time = #{writeStartTime,jdbcType=BIGINT},
+      </if>
+      <if test="writeEndTime != null">
+        write_end_time = #{writeEndTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.Questionnaire">
+    update t_qcp_questionnaire
+    set questionnaire_name = #{questionnaireName,jdbcType=VARCHAR},
+      start_time = #{startTime,jdbcType=BIGINT},
+      end_time = #{endTime,jdbcType=BIGINT},
+      type = #{type,jdbcType=TINYINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      write_start_time = #{writeStartTime,jdbcType=BIGINT},
+      write_end_time = #{writeEndTime,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mbg.xml

@@ -21,7 +21,7 @@
 
         <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://49.233.89.188:3306/carbasics?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://121.36.3.207:3306/carbasics?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
         </jdbcConnection>
@@ -56,7 +56,12 @@
             <property name="enableSubPackages" value="false" />
         </javaClientGenerator>
 
-        <table tableName="t_organization" domainObjectName="Organization"></table>
+<!--        <table tableName="t_organization" domainObjectName="Organization"></table>-->
+<!--        <table tableName="t_qcp_ocr_keyword" domainObjectName="OcrKeyword"></table>-->
+<!--        <table tableName="t_qcp_ocr_keyword_option" domainObjectName="OcrKeywordOption"></table>-->
+<!--        <table tableName="t_qcp_questionnaire" domainObjectName="Questionnaire"></table>-->
+<!--        <table tableName="t_qcp_questionnaire_detail" domainObjectName="QuestionnaireDetail"></table>-->
+<!--        <table tableName="t_area" domainObjectName="Area"></table>-->
 <!--        <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
 <!--        <table tableName="t_organization_member" domainObjectName="OrganizationMember"></table>-->
 <!--        <table tableName="t_organization_parent" domainObjectName="OrganizationParent"></table>-->
@@ -65,7 +70,7 @@
 <!--        <table tableName="t_organization_template" domainObjectName="OrganizationTemplate"></table>-->
 <!--        <table tableName="t_qcp_code_dictionaries" domainObjectName="CodeDictionaries"></table>-->
 <!--        <table tableName="t_qcp_code_parent" domainObjectName="CodeParent"></table>-->
-<!--        <table tableName="t_qcp_first_aid" domainObjectName="FirstAid"></table>-->
+        <table tableName="t_qcp_first_aid" domainObjectName="FirstAid"></table>
 <!--        <table tableName="t_qcp_first_aid_log" domainObjectName="FirstAidLog"></table>-->
 <!--        <table tableName="t_qcp_first_aid_member" domainObjectName="FirstAidMember"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table>-->