代码提交

liusheng

17 小时以前 52fd89a3c439fdbf240a72487f97aad92725e9c5

代码提交

 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java

@@ -586,4 +586,10 @@

    @ApiModelProperty(value = "随访时间")
    private Date visitTime;

    @ApiModelProperty(value = "随访部门编码")
    private String visitDeptCode;

    @ApiModelProperty(value = "随访部门名称")
    private String visitDeptName;
}

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java

@@ -683,5 +683,10 @@

    @ApiModelProperty(value = "随访时间")
    private Date visitTime;
    
    @ApiModelProperty(value = "随访部门编码")
    private String visitDeptCode;

    @ApiModelProperty(value = "随访部门名称")
    private String visitDeptName;
}

 smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java

@@ -416,4 +416,10 @@
    @ApiModelProperty("适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    @Excel(name = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    private String appltype;

    @ApiModelProperty(value = "随访部门编码")
    private String visitDeptCode;

    @ApiModelProperty(value = "随访部门名称")
    private String visitDeptName;
}

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -547,6 +547,16 @@
        ServiceTask serviceTask = serviceTasks.get(0);
        //封装serviceSubtask
        ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
        if (type != 2) {
            //科室和疾病 都用 科室填充
            serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeaveldeptcode());
            serviceSubtask.setVisitDeptName(patMedInhosp1.getLeaveldeptname());
        } else if (type == 2) {
            serviceSubtask.setVisitDeptCode(patMedInhosp1.getLeavehospitaldistrictcode());
            serviceSubtask.setVisitDeptName(patMedInhosp1.getLeavehospitaldistrictname());
        }


        Integer i = 0;
        //先判断一下，是否需要校验
        if (check) {

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -80,6 +80,8 @@
        <result property="isVisitAgain" column="is_visit_again"/>
        <result property="upid" column="upid"/>
        <result property="visitTime" column="visit_time"/>
        <result property="visitDeptName" column="visit_dept_name"/>
        <result property="visitDeptCode" column="visit_dept_code"/>
    </resultMap>

    <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -95,6 +97,8 @@
               task_guid,
               patfrom,
               upid,
               visit_dept_name,
               visit_dept_code,
               visit_time,
               inhospid,
               visit_count,
@@ -289,7 +293,7 @@
            <if test="excep != null ">and excep = #{excep}</if>
            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
            <if test="score != null">and score = #{score}</if>
<!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
            <!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
            <if test="visitCount != null and visitCount == 1">
                AND visit_count = 1
            </if>
@@ -302,6 +306,8 @@
            <if test="taskGuid != null">and task_guid = #{taskGuid}</if>
            <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
            <if test="visitTime != null">and visit_time = #{visitTime}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>
        <if test="sort != null  and sort==0">order by endtime asc</if>
        <if test="sort != null  and sort==1">order by endtime desc</if>
@@ -328,6 +334,8 @@
            <if test="upid != null ">and upid = #{upid}</if>
            <if test="visitCount != null ">and visit_count = #{visitCount}</if>
            <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>

    </select>
@@ -380,6 +388,8 @@
            <if test="excep != null ">and excep = #{excep}</if>
            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
            <if test="visitTime != null ">and visit_time = #{visitTime}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>

    </select>
@@ -478,6 +488,8 @@
            <if test="isVisitAgain != null ">is_visit_again,</if>
            <if test="upid != null ">upid,</if>
            <if test="visit_time != null ">visitTime,</if>
            <if test="visitDeptCode != null">visit_dept_code,</if>
            <if test="visitDeptName != null">visit_dept_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sendname != null">#{sendname},</if>
@@ -557,6 +569,8 @@
            <if test="isVisitAgain != null ">#{isVisitAgain},</if>
            <if test="upid != null ">#{upid},</if>
            <if test="visitTime != null ">#{visitTime},</if>
            <if test="visitDeptCode != null">#{visitDeptCode},</if>
            <if test="visitDeptName != null">#{visitDeptName},</if>
        </trim>
    </insert>

@@ -641,6 +655,8 @@
            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where id = #{id}
    </update>
@@ -726,6 +742,8 @@
            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        <where>
            <if test="patid != null ">and patid = #{patid}</if>
@@ -813,6 +831,8 @@
            <if test="patguid != null ">patguid=#{patguid},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
    </update>
@@ -897,6 +917,8 @@
            <if test="patguid != null ">patguid=#{patguid},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where task_guid = #{taskGuid} and task_name = #{taskName}
    </update>
@@ -941,6 +963,8 @@
                AND endtime > #{startTime}
                AND endtime &lt;= #{endTime}
            </if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
        </where>
    </select>

@@ -1016,6 +1040,8 @@
               task_guid,
               leavediagname,
               patguid,
               visitDeptCode,
               visitDeptName,
               leaveicd10code
        FROM service_subtask,
             JSON_TABLE(send_time_slot, '$[*]' COLUMNS (