Merge branch 'master' of ssh://101.201.226.163:50022/ccsens_wiki/carbasics

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

@@ -48,9 +48,9 @@ public class ExportController  {
 
     @ApiOperation(value = "导出最新急救信息(自用)", notes = "")
     @RequestMapping(value = "/exportFirstAid", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
-    public void exportFirstAid(String startTime, HttpServletResponse response) throws Exception{
+    public void exportFirstAid(String startTime,Byte type, HttpServletResponse response) throws Exception{
         log.info("导出最新急救信息(自用):{}",startTime);
-        Workbook workbook = exportService.exportFirstAid(startTime);
+        Workbook workbook = exportService.exportFirstAid(startTime,type);
         log.info("导出最新急救信息(自用)结束:{}",workbook);
         String fileName = "医院急救信息汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx";
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8));

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

@@ -127,7 +127,15 @@ public class QuestionnaireController {
         // 未添加时间条件
         Workbook workbook = questionnaireService.export(export);
         log.info("导出问卷记录结束");
-        String fileName = "山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx";
+        String str = "";
+        if (1L == export.getQid()) {
+            str = "2021年1-6月";
+        }else if (3L == export.getQid()) {
+            str = "2021年7-11月";
+        }else if (4L == export.getQid()) {
+            str = "2021年7-12月";
+        }
+        String fileName = str+"山西省缺血性脑卒中数据汇总表"+ DateUtil.format(new Date(), "yyyyMMddHHmmss") +".xlsx";
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, CharsetUtil.UTF_8));
         workbook.write(response.getOutputStream());
     }

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

@@ -60,6 +60,8 @@ public class AccountVo {
         private String positionCode;
         @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)")
         private Byte auditStatus;
+        @ApiModelProperty("数据来源(0-账户,1-问卷)")
+        private Byte dataFrom;
 
         public String getPhone() {
             return DesensitizedUtils.mobilePhone(phone);

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

@@ -2,7 +2,6 @@ package com.ccsens.carbasics.bean.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import javafx.geometry.Pos;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/ccsens/carbasics/bean/vo/message/RemindMessageVo.java

@@ -3,7 +3,9 @@ package com.ccsens.carbasics.bean.vo.message;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.util.message.BaseMessageDto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class RemindMessageVo extends BaseMessageDto {
     private Data data;

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

@@ -76,7 +76,7 @@ public interface FirstAidDao extends FirstAidMapper {
      * 查询四家医院的病例列表
      * @return 四家医院的病例列表
      */
-    List<FirstAidVo.NeedHospital> queryNeedHospital(@Param("startTime") Long startTime);
+    List<FirstAidVo.NeedHospital> queryNeedHospital(@Param("startTime") Long startTime,@Param("type") Byte type);
 
     /**
      * 质检员查看急救列表

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

@@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService {
         boolean flag = true;
         //1.校验字段是否都填写
         Integer num = questionnaireDetailDao.countCodeNumber(detailId);
-        if (num < 22) {
+        if (num < 24) {
            flag = false;
         }
         String answer = questionnaireDetailDao.queryXGZL(detailId);

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

@@ -260,7 +260,7 @@ public class ExportService implements IExportService{
 
 
     @Override
-    public Workbook exportFirstAid(String startTime) throws IOException, ParseException {
+    public Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException {
         Workbook workbook = new XSSFWorkbook();
         //空白格
         PoiUtil.PoiUtilCell blank = new PoiUtil.PoiUtilCell();
@@ -285,7 +285,7 @@ public class ExportService implements IExportService{
         Date parse = timeParam.parse(startTime);
         long time = parse.getTime();
 
-        List<FirstAidVo.NeedHospital> hospitalData = firstAidDao.queryNeedHospital(time);
+        List<FirstAidVo.NeedHospital> hospitalData = firstAidDao.queryNeedHospital(time,type);
         if (CollectionUtil.isNotEmpty(hospitalData)) {
             for (FirstAidVo.NeedHospital hospitalDatum : hospitalData) {
                 List<PoiUtil.PoiUtilCell> data = new ArrayList<>();

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

@@ -24,5 +24,5 @@ public interface IExportService {
      * @param startTime 用户id
      * @return excel
      */
-    Workbook exportFirstAid(String startTime) throws IOException, ParseException;
+    Workbook exportFirstAid(String startTime,Byte type) throws IOException, ParseException;
 }

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

@@ -114,14 +114,14 @@ public class QuestionnaireService implements IQuestionnaireService{
     @Override
     public void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId) throws Exception {
         //redis判断是否已有
-        Object o = redisUtil.get(param.getDetailId() + "" + userId);
+        Object o = redisUtil.get(param.getDetailId() + "" + userId + param.getCode());
         log.info("redis保存问卷用户{},{}",param.getDetailId() + "" + userId,o);
         if (ObjectUtil.isNull(o)) {
-            redisUtil.set(param.getDetailId() + "" + userId,userId);
+            redisUtil.set(param.getDetailId() + "" + userId + param.getCode(),userId);
             //查询是否已经提交,已提交不能保存修改
             QuestionnaireDetail questionnaireDetail = questionnaireDetailDao.selectByPrimaryKey(param.getDetailId());
             if (Constant.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) {
-                redisUtil.del(param.getDetailId() + "" + userId);
+                redisUtil.del(param.getDetailId() + "" + userId + param.getCode());
                 throw new BaseException(DefaultCodeError.HOSPITAL_REPEAT_SUBMIT);
             }
             Long recordId = recordDao.queryIsExist(param.getDetailId(),param.getCode());
@@ -139,7 +139,7 @@ public class QuestionnaireService implements IQuestionnaireService{
                 record.setAnswer(param.getAnswer());
                 recordDao.insertSelective(record);
             }
-            redisUtil.del(param.getDetailId() + "" + userId);
+            redisUtil.del(param.getDetailId() + "" + userId + param.getCode());
         }
 
 
@@ -186,7 +186,8 @@ public class QuestionnaireService implements IQuestionnaireService{
         List<String> stringList = new ArrayList<>();
         stringList.add("QXXWJ");
         List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList);
-        if (num <= qxxwj.size()) {
+        log.info("QXXWJ数量:{}",qxxwj.size());
+        if (num < qxxwj.size()) {
             throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
         }
         String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());
@@ -195,7 +196,7 @@ public class QuestionnaireService implements IQuestionnaireService{
             sonCode.add("XGZL");
             List<CodeVo.Basic> xgzl = codeDictionariesDao.query(sonCode);
             Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId());
-            if (sonOfXGZLNum <= xgzl.size()) {
+            if (sonOfXGZLNum < xgzl.size()) {
                 throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE);
             }
         }

src/main/resources/application.yml

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

src/main/resources/mapper_dao/AccountManageDao.xml

@@ -13,7 +13,8 @@
             department_code,
             position_name AS position,
             position_code,
-            audit_status
+            audit_status,
+            data_from
         FROM
             t_qcp_account_manage
         WHERE

src/main/resources/mapper_dao/AreaDao.xml

@@ -3,37 +3,29 @@
 <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"/>
+        <id column="shiid" property="id"/>
+        <result column="shiName" 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>
+            <id column="quid" property="id"/>
+            <result column="quName" property="name"/>
         </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
+            a.id AS shiid,
+            a.area_name AS shiName,
+            a1.id AS quid,
+            a1.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
+            a.rec_status = 0
+        AND a.area_parent_id = #{id}
         AND a.area_type = 0
+        AND	a1.rec_status = 0
         AND a1.area_type = 0
-        AND a2.area_type = 0
     </select>
     <select id="queryByIdArr" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaBasic">
         select id, area_name as name from t_area

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -256,12 +256,14 @@
         LEFT JOIN t_organization_project AS op ON o.id = op.organization_id
         WHERE
             o.rec_status = 0
+        <if test="type == 0">
         AND o.`name` IN (
             '山西医科大学第一医院',
             '太原钢铁（集团）有限公司总医院',
             '运城市盐湖区人民医院',
             '晋中市榆次区人民医院'
         )
+        </if>
         AND op.rec_status = 0
         AND f.rec_status = 0
         <if test="startTime != null and startTime != ''">