Merge branch 'master' into bfyMa

# Conflicts:
#	src/main/resources/mbg.xml

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

@@ -151,4 +151,24 @@ public class QuestionnaireController {
         log.info("查询是否可以进入问卷结束{}",isShow);
         return JsonResponse.newInstance().ok(isShow);
     }
+
+    @MustLogin
+    @ApiOperation(value = "医院名称回显", notes = "")
+    @RequestMapping(value = "/hospitalNameEcho", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<QuestionnaireVo.HospitalName> hospitalNameEcho(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
+        log.info("医院名称回显开始{}",params);
+        QuestionnaireVo.HospitalName hospitalName = questionnaireService.hospitalNameEcho(params.getUserId());
+        log.info("医院名称回显结束{}",hospitalName);
+        return JsonResponse.newInstance().ok(hospitalName);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询医院列表", notes = "")
+    @RequestMapping(value = "/queryHospitalList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<QuestionnaireVo.HospitalName>> queryHospitalList(@ApiParam @Validated @RequestBody QueryDto<QuestionnaireDto.QueryHospitalList> params) throws Exception{
+        log.info("问卷查询医院列表开始{}",params);
+        List<QuestionnaireVo.HospitalName> hospitalList = questionnaireService.queryHospitalList(params.getParam(),params.getUserId());
+        log.info("问卷查询医院列表结束{}",hospitalList);
+        return JsonResponse.newInstance().ok(hospitalList);
+    }
 }

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

@@ -97,4 +97,13 @@ public class QuestionnaireDto {
         private String endTime;
     }
 
+    @Data
+    @ApiModel("查询医院列表-请求")
+    public static class QueryHospitalList {
+        @ApiModelProperty("地区")
+        private String area;
+        @ApiModelProperty("名字")
+        private String name;
+    }
+
 }

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

@@ -26,6 +26,8 @@ public class AccountManage implements Serializable {
 
     private Byte auditStatus;
 
+    private Byte dataFrom;
+
     private Date createdAt;
 
     private Date updatedAt;
@@ -122,6 +124,14 @@ public class AccountManage implements Serializable {
         this.auditStatus = auditStatus;
     }
 
+    public Byte getDataFrom() {
+        return dataFrom;
+    }
+
+    public void setDataFrom(Byte dataFrom) {
+        this.dataFrom = dataFrom;
+    }
+
     public Date getCreatedAt() {
         return createdAt;
     }
@@ -163,6 +173,7 @@ public class AccountManage implements Serializable {
         sb.append(", submitterUserId=").append(submitterUserId);
         sb.append(", aduitUserId=").append(aduitUserId);
         sb.append(", auditStatus=").append(auditStatus);
+        sb.append(", dataFrom=").append(dataFrom);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);

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

@@ -835,6 +835,66 @@ public class AccountManageExample {
             return (Criteria) this;
         }
 
+        public Criteria andDataFromIsNull() {
+            addCriterion("data_from is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIsNotNull() {
+            addCriterion("data_from is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromEqualTo(Byte value) {
+            addCriterion("data_from =", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotEqualTo(Byte value) {
+            addCriterion("data_from <>", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThan(Byte value) {
+            addCriterion("data_from >", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromGreaterThanOrEqualTo(Byte value) {
+            addCriterion("data_from >=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThan(Byte value) {
+            addCriterion("data_from <", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromLessThanOrEqualTo(Byte value) {
+            addCriterion("data_from <=", value, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromIn(List<Byte> values) {
+            addCriterion("data_from in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotIn(List<Byte> values) {
+            addCriterion("data_from not in", values, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromBetween(Byte value1, Byte value2) {
+            addCriterion("data_from between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataFromNotBetween(Byte value1, Byte value2) {
+            addCriterion("data_from not between", value1, value2, "dataFrom");
+            return (Criteria) this;
+        }
+
         public Criteria andCreatedAtIsNull() {
             addCriterion("created_at is null");
             return (Criteria) this;

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

@@ -103,4 +103,11 @@ public class QuestionnaireVo {
         @ApiModelProperty("职务")
         private String position;
     }
+
+    @Data
+    @ApiModel("医院名称回显-返参")
+    public static class HospitalName {
+        @ApiModelProperty("医院名称")
+        private String name;
+    }
 }

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

@@ -33,4 +33,18 @@ public interface QuestionnaireRecordDao extends QuestionnaireRecordMapper {
      * @return 记录
      */
     List<Map<String, String>> queryRecord(@Param("export") QuestionnaireDto.Export export, @Param("codes") List<CodeVo.Basic> codes,@Param("qid") Long qid);
+
+    /**
+     * 医院名称回显
+     * @param userId 用户id
+     * @return 医院名称回显
+     */
+    QuestionnaireVo.HospitalName hospitalNameEcho(@Param("userId") Long userId);
+
+    /**
+     * 查询医院列表
+     * @param param 参数
+     * @return 医院列表
+     */
+    List<QuestionnaireVo.HospitalName> queryHospitalList(@Param("param") QuestionnaireDto.QueryHospitalList param);
 }

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

@@ -59,6 +59,7 @@ public class AccountManageService implements IAccountManageService {
         accountManage.setId(snowflake.nextId());
         accountManage.setSubmitterUserId(userId);
         accountManage.setAuditStatus((byte) 0);
+        accountManage.setDataFrom((byte) 0);
         accountManageDao.insertSelective(accountManage);
     }
 

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

@@ -94,4 +94,19 @@ public interface IQuestionnaireService {
      * @return 是否展示
      */
     ButtonVO.IsShow queryIsShow(Long userId);
+
+    /**
+     * 医院名称回显
+     * @param userId 用户id
+     * @return 医院名称
+     */
+    QuestionnaireVo.HospitalName hospitalNameEcho(Long userId);
+
+    /**
+     * 查询医院列表
+     * @param param 参数
+     * @param userId 用户id
+     * @return 医院列表
+     */
+    List<QuestionnaireVo.HospitalName> queryHospitalList(QuestionnaireDto.QueryHospitalList param, Long userId);
 }

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

@@ -174,13 +174,19 @@ public class QuestionnaireService implements IQuestionnaireService{
         }
         //1.校验字段是否都填写
         Integer num = questionnaireDetailDao.countCodeNumber(param.getDetailId());
-        if (num < 22) {
+        List<String> stringList = new ArrayList<>();
+        stringList.add("QXXWJ");
+        List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList);
+        if (num <= qxxwj.size()) {
             throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
         }
         String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());
         if ("是".equals(answer)) {
+            List<String> sonCode = new ArrayList<>();
+            sonCode.add("XGZL");
+            List<CodeVo.Basic> xgzl = codeDictionariesDao.query(sonCode);
             Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId());
-            if (sonOfXGZLNum < 23) {
+            if (sonOfXGZLNum <= xgzl.size()) {
                 throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE);
             }
         }
@@ -214,6 +220,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         accountManage.setSubmitterPhone(param.getPhone());
         accountManage.setSubmitterUserId(userId);
         accountManage.setAuditStatus((byte) 0);
+        accountManage.setDataFrom((byte) 1);
         accountManageDao.insertSelective(accountManage);
         return new QuestionnaireVo.SubmitInfo();
 //        if (ObjectUtil.isNotNull(submitId)) {
@@ -705,6 +712,16 @@ public class QuestionnaireService implements IQuestionnaireService{
         return isShow;
     }
 
+    @Override
+    public QuestionnaireVo.HospitalName hospitalNameEcho(Long userId) {
+        return questionnaireRecordDao.hospitalNameEcho(userId);
+    }
+
+    @Override
+    public List<QuestionnaireVo.HospitalName> queryHospitalList(QuestionnaireDto.QueryHospitalList param, Long userId) {
+        return questionnaireRecordDao.queryHospitalList(param);
+    }
+
     public String queryRole(Long positionId){
         OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
 //        if (position.getCode().equals(Constant.PositionIdAndRole.CuZhongZhongXinBanGongShiZhuRen.positionCode)){

src/main/resources/druid-test.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/carbasics?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/carbasics_bak?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/mapper_dao/QuestionnaireDao.xml

@@ -160,7 +160,7 @@
         WHERE
             rec_status = 0
         AND type = 0
-        ORDER BY end_time
+        ORDER BY end_time DESC
     </select>
 
 

src/main/resources/mapper_dao/QuestionnaireRecordDao.xml

@@ -49,6 +49,41 @@
         (select d.id, d.submit_status, d.updated_at from t_qcp_questionnaire_detail d, t_qcp_questionnaire_record r,t_qcp_questionnaire AS q where d.id = r.questionnaire_detail_id and d.rec_status = 0 and r.rec_status = 0  AND q.rec_status = 0
         AND d.questionnaire_id = #{qid} ) t1
         group by t1.id
+        ORDER BY updateTime
+    </select>
+
+    <select id="hospitalNameEcho" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$HospitalName">
+        SELECT
+            qr.answer AS name
+        FROM
+            t_qcp_questionnaire_detail AS qd,
+            t_qcp_questionnaire_record AS qr
+        WHERE qd.id = qr.questionnaire_detail_id
+        AND qd.rec_status = 0 AND qr.rec_status = 0
+        AND qd.submit_status = 1 AND qd.user_id = #{userId}
+        AND qr.question_code = 'HOS-NAME'
+    </select>
+
+    <select id="queryHospitalList" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$HospitalName">
+        SELECT
+            DISTINCT
+            qr.answer AS `name`
+        FROM
+            t_qcp_questionnaire_record AS qr
+            LEFT JOIN t_qcp_questionnaire_detail AS qd ON qr.questionnaire_detail_id = qd.id
+            LEFT JOIN t_qcp_questionnaire_record AS area ON area.questionnaire_detail_id  = qd.id
+        WHERE
+            qr.rec_status = 0
+            AND qd.rec_status = 0
+            AND qr.question_code = 'HOS-NAME'
+            AND qd.submit_status = 1
+            <if test="param.name != null and param.name != ''">
+                AND qr.answer LIKE concat('%',#{param.name},'%')
+            </if>
+            <if test="param.area != null and param.area != ''">
+                AND area.answer = #{param.area}
+            </if>
+
     </select>
 
 </mapper>

src/main/resources/mapper_raw/AccountManageMapper.xml

@@ -13,6 +13,7 @@
     <result column="submitter_user_id" jdbcType="BIGINT" property="submitterUserId" />
     <result column="aduit_user_id" jdbcType="BIGINT" property="aduitUserId" />
     <result column="audit_status" jdbcType="TINYINT" property="auditStatus" />
+    <result column="data_from" jdbcType="TINYINT" property="dataFrom" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
@@ -77,8 +78,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, hospital_name, department_name, department_code, position_name, position_code, 
-    submitter, submitter_phone, submitter_user_id, aduit_user_id, audit_status, created_at, 
-    updated_at, rec_status
+    submitter, submitter_phone, submitter_user_id, aduit_user_id, audit_status, data_from, 
+    created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.AccountManageExample" resultMap="BaseResultMap">
     select
@@ -114,13 +115,15 @@
     insert into t_qcp_account_manage (id, hospital_name, department_name, 
       department_code, position_name, position_code, 
       submitter, submitter_phone, submitter_user_id, 
-      aduit_user_id, audit_status, created_at, 
-      updated_at, rec_status)
+      aduit_user_id, audit_status, data_from, 
+      created_at, updated_at, rec_status
+      )
     values (#{id,jdbcType=BIGINT}, #{hospitalName,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, 
       #{departmentCode,jdbcType=VARCHAR}, #{positionName,jdbcType=VARCHAR}, #{positionCode,jdbcType=VARCHAR}, 
       #{submitter,jdbcType=VARCHAR}, #{submitterPhone,jdbcType=VARCHAR}, #{submitterUserId,jdbcType=BIGINT}, 
-      #{aduitUserId,jdbcType=BIGINT}, #{auditStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+      #{aduitUserId,jdbcType=BIGINT}, #{auditStatus,jdbcType=TINYINT}, #{dataFrom,jdbcType=TINYINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.AccountManage">
     insert into t_qcp_account_manage
@@ -158,6 +161,9 @@
       <if test="auditStatus != null">
         audit_status,
       </if>
+      <if test="dataFrom != null">
+        data_from,
+      </if>
       <if test="createdAt != null">
         created_at,
       </if>
@@ -202,6 +208,9 @@
       <if test="auditStatus != null">
         #{auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="dataFrom != null">
+        #{dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -255,6 +264,9 @@
       <if test="record.auditStatus != null">
         audit_status = #{record.auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.dataFrom != null">
+        data_from = #{record.dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="record.createdAt != null">
         created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -282,6 +294,7 @@
       submitter_user_id = #{record.submitterUserId,jdbcType=BIGINT},
       aduit_user_id = #{record.aduitUserId,jdbcType=BIGINT},
       audit_status = #{record.auditStatus,jdbcType=TINYINT},
+      data_from = #{record.dataFrom,jdbcType=TINYINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT}
@@ -322,6 +335,9 @@
       <if test="auditStatus != null">
         audit_status = #{auditStatus,jdbcType=TINYINT},
       </if>
+      <if test="dataFrom != null">
+        data_from = #{dataFrom,jdbcType=TINYINT},
+      </if>
       <if test="createdAt != null">
         created_at = #{createdAt,jdbcType=TIMESTAMP},
       </if>
@@ -346,6 +362,7 @@
       submitter_user_id = #{submitterUserId,jdbcType=BIGINT},
       aduit_user_id = #{aduitUserId,jdbcType=BIGINT},
       audit_status = #{auditStatus,jdbcType=TINYINT},
+      data_from = #{dataFrom,jdbcType=TINYINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT}

src/main/resources/mbg.xml

@@ -21,7 +21,7 @@
 
         <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://test.tall.wiki:3306/carbasics?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://test.tall.wiki:3306/carbasics_bak?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
         </jdbcConnection>
@@ -84,6 +84,7 @@
 <!--        <table tableName="t_constant" domainObjectName="ConstantDB"></table>-->
 <!--        <table tableName="t_qcp_last_role_choose" domainObjectName="LastRoleChoose"></table>-->
 <!--        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></table>-->
+        <table tableName="t_qcp_account_manage" domainObjectName="AccountManage"></table>
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_step" domainObjectName="Step"></table>-->