Merge branch 'master-prod-new' into Andru-MIC看板优化

Andru

2024-01-11 8bddeea5418006006e00a2181d9533964e548be6

Merge branch 'master-prod-new' into Andru-MIC看板优化

* master-prod-new:
  评价优化优化
  评价优化优化

 phi_platform_common/src/main/resources/mapper/platform/InvestigateDataMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,investigateId = #{investigateId},userId = #{userId},data = #{data},projectId = #{projectId},projectName = #{projectName},shopId = #{shopId},shopName = #{shopName},deductionSingleId = #{deductionSingleId},type = #{type},startTime = #{startTime},doneTime = #{doneTime},proposal = #{proposal},userName = #{userName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},deductionSingleTime = #{deductionSingleTime},isDone = #{isDone},nurseScore = #{nurseScore},consultantScore = #{consultantScore},isHighQuality = #{isHighQuality},isComplete = #{isComplete},doctorScore = #{doctorScore},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,investigateId = #{investigateId},userId = #{userId},data = #{data},projectId = #{projectId},projectName = #{projectName},shopId = #{shopId},shopName = #{shopName},deductionSingleId = #{deductionSingleId},type = #{type},startTime = #{startTime},doneTime = #{doneTime},proposal = #{proposal},userName = #{userName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},deductionSingleTime = #{deductionSingleTime},isDone = #{isDone},nurseScore = #{nurseScore},consultantScore = #{consultantScore},isHighQuality = #{isHighQuality},isComplete = #{isComplete},doctorScore = #{doctorScore},receptionScore = #{receptionScore},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,7 +19,7 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into investigate_data (id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime)  values (#{id},#{investigateId},#{userId},#{data},#{projectId},#{projectName},#{shopId},#{shopName},#{deductionSingleId},#{type},#{startTime},#{doneTime},#{proposal},#{userName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{deductionSingleTime},#{isDone},#{nurseScore},#{consultantScore},#{isHighQuality},#{isComplete},#{doctorScore},#{isDel},#{createTime},#{editTime})
        insert into investigate_data (id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime)  values (#{id},#{investigateId},#{userId},#{data},#{projectId},#{projectName},#{shopId},#{shopName},#{deductionSingleId},#{type},#{startTime},#{doneTime},#{proposal},#{userName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{deductionSingleTime},#{isDone},#{nurseScore},#{consultantScore},#{isHighQuality},#{isComplete},#{doctorScore},#{receptionScore},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -51,14 +51,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="java.lang.Object" >
        select 
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime
        from investigate_data
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.questionnaire.InvestigateData" parameterType="java.lang.Object" >
        select 
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,isDel,createTime,editTime
            id,investigateId,userId,data,projectId,projectName,shopId,shopName,deductionSingleId,type,startTime,doneTime,proposal,userName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,deductionSingleTime,isDone,nurseScore,consultantScore,isHighQuality,isComplete,doctorScore,receptionScore,isDel,createTime,editTime
        from investigate_data
        WHERE id = #{value}
    </select>

 phi_platform_user/src/main/java/com/hx/phip/AutoDomeUtil.java

@@ -2,7 +2,7 @@

import com.hx.auto.GeneratorUtil;
import com.hx.auto.common.UrlData;
import com.hx.phiappt.model.user.UserAcquisitionRecord;
import com.hx.phiappt.model.questionnaire.InvestigateData;
import com.hx.util.StringUtils;

import java.io.File;
@@ -27,7 +27,7 @@
        String controllerPackRootResourse = "phi_platform_user.src.main.resources";

        // 替换此处名字
        Class<?> clas = UserAcquisitionRecord.class;
        Class<?> clas = InvestigateData.class;


        // 获取对象生成的上层包名

 phi_platform_user/src/main/java/com/hx/phip/service/questionnaire/impl/QuestionnaireServiceImpl.java

@@ -446,6 +446,7 @@
        StringBuilder proposal = new StringBuilder();
        StringBuilder nurse = new StringBuilder();
        StringBuilder doctor = new StringBuilder();
        StringBuilder reception = new StringBuilder();
        //List<String> clozeIds = Arrays.asList(questionInvestigateConfig.getNewProposal(), questionInvestigateConfig.getOldProposal());
        Integer isHighQuality = 0;
        QuestionTitle questionTitle = null;
@@ -489,6 +490,13 @@
                                doctor.append(",");
                            }
                        }
                    }else if (QuestionTitle.SPECIAL_TYPE_RECEPTION.equals(questionTitle.getSpecialType())){
                        for (int s = 0; s < answerDto.getAnswer().length; s++) {
                            reception.append(answerDto.getAnswer()[s]);
                            if (s != answerDto.getAnswer().length - 1) {
                                reception.append(",");
                            }
                        }
                    }
                }
            }
@@ -507,7 +515,9 @@
        if (doctor.length() > 0){
            data.setDoctorScore(doctor.toString());
        }

        if (reception.length() > 0){
            data.setReceptionScore(reception.toString());
        }
        data.setIsHighQuality(isHighQuality);
        int i = investigateDataMapper.insert(data);
        if (i != 1) {