ruoyi-common/src/main/java/com/ruoyi/common/aspectj/SetOrgIdAspect.java
@@ -2,13 +2,16 @@ import com.ruoyi.common.annotation.AddOrgId; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.service.IConfigService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.lang.reflect.Field; @@ -25,6 +28,9 @@ { private static final Logger log = LoggerFactory.getLogger(SetOrgIdAspect.class); @Autowired private IConfigService sysConfigService; @Before("@annotation(setOrgId)") public void setOrgId(JoinPoint joinPoint, AddOrgId setOrgId) throws Throwable { @@ -36,6 +42,14 @@ { String orgid = loginUser.getUser().getOrgid(); String campusid = loginUser.getUser().getCampusid(); //显示所有院区权限 String allCampus = sysConfigService.selectConfigByKey("sys.authority.campus.all"); if(StringUtils.isNotEmpty(allCampus)){ allCampus = "," + allCampus + ","; if (allCampus.contains("," + loginUser.getUser().getUserName() + ",")) { campusid = null; } } // 获取方法参数 Object[] args = joinPoint.getArgs(); smartor/src/main/java/com/smartor/domain/ServiceStatisticsRequest.java
@@ -34,6 +34,9 @@ @ApiModelProperty(value = "机构ID，为空则查询所有") private String orgid; @ApiModelProperty(value = "院区ID，为空则查询所有") private String campusid; @ApiModelProperty(value = "科室编码列表，为空则查询所有") private List<String> deptcodes;
@@ -31,6 +31,10 @@ @ApiModelProperty(value = "几天及时率") private Integer rateDay; /** * 是否再次随访 */ @ApiModelProperty(value = "几天及时率") private Integer isVisitAgain; @ApiModelProperty(value = "异常预警：0绿色；1红色；2黄色") smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -224,6 +224,22 @@ @Excel(name = " 首次微信 ") private Long weChat = 0L; @ApiModelProperty(value = "首次人工成功") @Excel(name = " 首次人工成功 ") private Long manualSuccess = 0L; @ApiModelProperty(value = "首次语音成功") @Excel(name = " 首次语音成功 ") private Long voiceSuccess = 0L; @ApiModelProperty(value = "首次短信成功") @Excel(name = " 首次短信成功 ") private Long smsSuccess = 0L; @ApiModelProperty(value = "首次微信成功") @Excel(name = " 首次微信成功 ") private Long weChatSuccess = 0L; @ApiModelProperty(value = "结果异常") private Long abnormal = 0L; @@ -264,8 +280,25 @@ private Long smsAgain = 0L; @ApiModelProperty(value = "二次微信") @Excel(name = " 二次微信 ") private Long weChatAgain = 0L; @ApiModelProperty(value = "二次人工成功") @Excel(name = " 二次人工成功 ") private Long manualAgainSuccess = 0L; @ApiModelProperty(value = "二次语音成功") @Excel(name = " 二次语音成功 ") private Long voiceAgainSuccess = 0L; @ApiModelProperty(value = "二次短信成功") @Excel(name = " 二次短信成功 ") private Long smsAgainSuccess = 0L; @ApiModelProperty(value = "二次微信成功") @Excel(name = " 二次微信成功 ") private Long weChatAgainSuccess = 0L; @ApiModelProperty(value = "结果异常") private Long abnormalAgain = 0L;
@@ -258,6 +258,7 @@ /** * 院区ID */ @Excel(name = " 院区ID ") @ApiModelProperty(value = "院区ID") private String campusid;
@@ -3338,6 +3338,24 @@ serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L); } } //首次随访人工成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) { serviceSubtaskStatistic.setManualSuccess(serviceSubtaskStatistic.getManualSuccess() + 1L); } //首次随访语音成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) { serviceSubtaskStatistic.setVoiceSuccess(serviceSubtaskStatistic.getVoiceSuccess() + 1L); } //首次随访短信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) { serviceSubtaskStatistic.setSmsSuccess(serviceSubtaskStatistic.getSmsSuccess() + 1L); } //首次随访微信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) { serviceSubtaskStatistic.setWeChatSuccess(serviceSubtaskStatistic.getWeChatSuccess() + 1L); } if (serviceSubtaskStatistic.getNeedFollowUp() > 0) { double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp(); serviceSubtaskStatistic.setFollowUpRate(percentFormat.format(rate)); @@ -3433,6 +3451,24 @@ serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L); } } //再次随访人工成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) { serviceSubtaskStatistic.setManualAgainSuccess(serviceSubtaskStatistic.getManualAgainSuccess() + 1L); } //再次随访语音成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) { serviceSubtaskStatistic.setVoiceAgainSuccess(serviceSubtaskStatistic.getVoiceAgainSuccess() + 1L); } //再次随访短信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) { serviceSubtaskStatistic.setSmsAgainSuccess(serviceSubtaskStatistic.getSmsAgainSuccess() + 1L); } //再次随访微信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) { serviceSubtaskStatistic.setWeChatAgainSuccess(serviceSubtaskStatistic.getWeChatAgainSuccess() + 1L); } if (serviceSubtaskStatistic.getNeedFollowUp() > 0) { double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain(); serviceSubtaskStatistic.setFollowUpRateAgain(percentFormat.format(rate)); @@ -3587,6 +3623,24 @@ serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L); } } //首次随访人工成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) { serviceSubtaskStatistic.setManualSuccess(serviceSubtaskStatistic.getManualSuccess() + 1L); } //首次随访语音成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) { serviceSubtaskStatistic.setVoiceSuccess(serviceSubtaskStatistic.getVoiceSuccess() + 1L); } //首次随访短信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) { serviceSubtaskStatistic.setSmsSuccess(serviceSubtaskStatistic.getSmsSuccess() + 1L); } //首次随访微信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) { serviceSubtaskStatistic.setWeChatSuccess(serviceSubtaskStatistic.getWeChatSuccess() + 1L); } if (serviceSubtaskStatistic.getNeedFollowUp() > 0) { double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp(); serviceSubtaskStatistic.setFollowUpRate(percentFormat.format(rate)); @@ -3738,6 +3792,24 @@ serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L); } } //再次随访人工成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) { serviceSubtaskStatistic.setManualAgainSuccess(serviceSubtaskStatistic.getManualAgainSuccess() + 1L); } //再次随访语音成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) { serviceSubtaskStatistic.setVoiceAgainSuccess(serviceSubtaskStatistic.getVoiceAgainSuccess() + 1L); } //再次随访短信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) { serviceSubtaskStatistic.setSmsAgainSuccess(serviceSubtaskStatistic.getSmsAgainSuccess() + 1L); } //再次随访微信成功 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate().equals(6L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) { serviceSubtaskStatistic.setWeChatAgainSuccess(serviceSubtaskStatistic.getWeChatAgainSuccess() + 1L); } if (serviceSubtaskStatistic.getNeedFollowUp() > 0) { double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain(); serviceSubtaskStatistic.setFollowUpRateAgain(percentFormat.format(rate)); @@ -4168,6 +4240,10 @@ * voiceInfo - visitCount = 1 && currentPreachForm = "3" * smsInfo - visitCount = 1 && currentPreachForm = "4" * wechatInfo - visitCount = 1 && currentPreachForm = "5" * manualSuccessInfo - visitCount = 1 && currentPreachForm = "1" && sendstate = 6 * voiceSuccessInfo - visitCount = 1 && currentPreachForm = "3" && sendstate = 6 * smsSuccessInfo - visitCount = 1 && currentPreachForm = "4" && sendstate = 6 * wechatSuccessInfo - visitCount = 1 && currentPreachForm = "5" && sendstate = 6 * abnormalInfo - visitCount = 1 && excep = "1" * needFollowUpAgainInfo - visitCount > 1 && sendstate != 4 * pendingFollowUpAgainInfo - visitCount > 1 && sendstate = 2 @@ -4177,6 +4253,10 @@ * voiceAgainInfo - visitCount > 1 && currentPreachForm = "3" * smsAgainInfo - visitCount > 1 && currentPreachForm = "4" * wechatAgainInfo - visitCount > 1 && currentPreachForm = "5" * manualAgainSuccessInfo - visitCount > 1 && currentPreachForm = "1" && sendstate = 6 * voiceAgainSuccessInfo - visitCount > 1 && currentPreachForm = "3" && sendstate = 6 * smsAgainSuccessInfo - visitCount > 1 && currentPreachForm = "4" && sendstate = 6 * wechatAgainSuccessInfo - visitCount > 1&& currentPreachForm = "5" && sendstate = 6 * abnormalAgainInfo- visitCount = 1 && excep = "1" * taskSituation1Info - taskSituation = 1 * taskSituation2Info - taskSituation = 2 @@ -4260,6 +4340,26 @@ serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setCurrentPreachform("5"); break; case "manualSuccessInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("1"); break; case "voiceSuccessInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("3"); break; case "smsSuccessInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("4"); break; case "wechatSuccessInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("5"); break; case "abnormalInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setExcep("1"); @@ -4296,6 +4396,26 @@ serviceSubtaskCountReq.setVisitCount(2); serviceSubtaskCountReq.setCurrentPreachform("5"); break; case "manualAgainSuccessInfo": serviceSubtaskCountReq.setVisitCount(1); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("1"); break; case "voiceAgainSuccessInfo": serviceSubtaskCountReq.setVisitCount(2); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("3"); break; case "smsAgainSuccessInfo": serviceSubtaskCountReq.setVisitCount(2); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("4"); break; case "wechatAgainSuccessInfo": serviceSubtaskCountReq.setVisitCount(2); serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L))); serviceSubtaskCountReq.setCurrentPreachform("5"); break; case "abnormalAgainInfo": serviceSubtaskCountReq.setVisitCount(2); serviceSubtaskCountReq.setExcep("1"); smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -274,6 +274,7 @@ <if test="inhospno != null ">and b.inhospno = #{inhospno}</if> <if test="fuflag != null ">and b.fuflag = #{fuflag}</if> <if test="orgid != null ">and b.orgid = #{orgid}</if> <if test="campusid != null ">and b.campusid = #{campusid}</if> <if test="serialnum != null ">and b.serialnum = #{serialnum}</if> <if test="endtime != null ">and b.endtime = #{endtime}</if> <if test="patno != null ">and b.patno = #{patno}</if> @@ -293,7 +294,6 @@ <if test="cry != null and cry == 2 ">and b.inhospstate=2</if> <if test="cry != null and cry == 3 ">and b.inhospstate=3</if> <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if> <if test="campusid != null ">and b.campusid = #{campusid}</if> <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if> <if test="outWayId != null ">and b.out_way_id = #{outWayId}</if> <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if> @@ -454,6 +454,9 @@ <if test="orgid != null and orgid != ''"> and orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> and campusid = #{campusid} </if> <if test="encounterSourceId != null and encounterSourceId != ''"> and b.encounter_source_id = #{encounterSourceId} </if> @@ -565,6 +568,9 @@ <if test="orgid != null and orgid != ''"> and a.orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> and a.campusid = #{campusid} </if> <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname}, '%') </if> @@ -580,7 +586,6 @@ <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if> <if test="nurseName != null ">and b.nurse_name = #{nurseName}</if> <if test="patno != null ">and b.patno = #{patno}</if> <if test="campusid != null ">and b.campusid = #{campusid}</if> <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if> <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if> <if test="scheduleCheckFlag != null ">and b.schedulecheck_flag = #{scheduleCheckFlag}</if> @@ -652,6 +657,7 @@ <if test="roomno != null">and roomno = #{roomno}</if> <if test="bedNo != null">and bed_no = #{bedNo}</if> <if test="orgid != null">and orgid = #{orgid}</if> <if test="campusid != null ">and campusid = #{campusid}</if> <if test="updateBy != null">and update_by = #{updateBy}</if> <if test="updateTime != null">and update_time = #{updateTime}</if> <if test="createBy != null">and create_by = #{createBy}</if> @@ -701,7 +707,6 @@ <if test="fuspecialadvice != null ">and fuspecialadvice = #{fuspecialadvice}</if> <if test="managementDoctor != null ">and management_doctor = #{managementDoctor}</if> <if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if> <if test="campusid != null ">and campusid = #{campusid}</if> <if test="importanceFlagCode != null ">and importance_flag_code = #{importanceFlagCode}</if> <if test="emergencyLevelCode != null ">and emergency_level_code = #{emergencyLevelCode}</if> <if test="encounterSourceId != null ">and encounter_source_id = #{encounterSourceId}</if> @@ -731,6 +736,7 @@ <if test="roomno != null">roomno,</if> <if test="bedNo != null">bed_no,</if> <if test="orgid != null">orgid,</if> <if test="campusid != null">campusid,</if> <if test="delFlag != null and delFlag != ''">del_flag,</if> <if test="updateBy != null">update_by,</if> <if test="updateTime != null">update_time,</if> @@ -781,7 +787,6 @@ <if test="fuspecialadvice != null ">fuspecialadvice,</if> <if test="managementDoctor != null ">management_doctor,</if> <if test="managementDoctorCode != null ">management_doctor_code,</if> <if test="campusid != null ">campusid,</if> <if test="inhospMydFlag != null ">inhosp_myd_flag,</if> <if test="importanceFlagCode != null ">importance_flag_code,</if> <if test="emergencyLevelCode != null ">emergency_level_code,</if> @@ -805,6 +810,7 @@ <if test="roomno != null">#{roomno},</if> <if test="bedNo != null">#{bedNo},</if> <if test="orgid != null">#{orgid},</if> <if test="campusid != null">#{campusid},</if> <if test="delFlag != null and delFlag != ''">#{delFlag},</if> <if test="updateBy != null">#{updateBy},</if> <if test="updateTime != null">#{updateTime},</if> @@ -855,7 +861,6 @@ <if test="fuspecialadvice != null ">#{fuspecialadvice},</if> <if test="managementDoctor != null ">#{managementDoctor},</if> <if test="managementDoctorCode != null ">#{managementDoctorCode},</if> <if test="campusid != null ">#{campusid},</if> <if test="importanceFlagCode != null ">#{importanceFlagCode},</if> <if test="emergencyLevelCode != null ">#{emergencyLevelCode},</if> <if test="encounterSourceId != null ">#{encounterSourceId},</if> @@ -928,6 +933,7 @@ <if test="roomno != null">roomno = #{roomno},</if> <if test="bedNo != null">bed_no = #{bedNo},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null">campusid = #{campusid},</if> <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if> <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> @@ -978,7 +984,6 @@ <if test="fuspecialadvice != null ">fuspecialadvice = #{fuspecialadvice},</if> <if test="managementDoctor != null ">management_doctor = #{managementDoctor},</if> <if test="managementDoctorCode != null ">management_doctor_code = #{managementDoctorCode},</if> <if test="campusid != null ">campusid = #{campusid},</if> <if test="inhospMydFlag != null ">inhosp_myd_flag = #{inhospMydFlag},</if> <if test="importanceFlagCode != null ">importance_flag_code = #{importanceFlagCode},</if> <if test="emergencyLevelCode != null ">emergency_level_code = #{emergencyLevelCode},</if> @@ -1034,6 +1039,9 @@ <if test="orgid != null and orgid != ''"> AND pat_med_inhosp.orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> and pat_med_inhosp.campusid = #{campusid} </if> AND pat_archive.idcardno IS NOT NULL <if test="zy != null"> AND pat_med_inhosp.inhospstate = 0 @@ -1071,6 +1079,9 @@ <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> and campusid = #{campusid} </if> <if test="startDate != null"> AND visit_time >= #{startDate} </if> smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -653,7 +653,8 @@ <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if> <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="pid != null ">and pid = #{pid}</if> <if test="preachform != null ">and preachform = #{preachform}</if> <if test="guid != null and guid != ''">and guid = #{guid}</if> @@ -719,7 +720,8 @@ AND date_format(visit_time,'%y%m%d') >= date_format(#{starttime},'%y%m%d') AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d') </if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if> <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if> <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if> @@ -827,6 +829,7 @@ AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d') </if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if> <if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if> <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if> @@ -857,7 +860,8 @@ <if test="sendname != null">and sendname like concat('%',#{sendname}, '%')</if> <if test="taskName != null">and task_name like concat('%',#{taskName}, '%')</if> <if test="sendstate != null">and sendstate = #{sendstate}</if> <if test="orgid != null">and orgid =#{orgid}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid} </if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="continueFlag != null ">and continue_flag = #{continueFlag}</if> <if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if> <if test="continueCount != null ">and continue_count = #{continueCount}</if> @@ -903,7 +907,8 @@ <if test="createTime != null">create_time,</if> <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="orgid != null">orgid,</if> <if test="orgid != null and orgid != ''">orgid,</if> <if test="campusid != null and campusid != ''">campusid,</if> <if test="pid != null">pid,</if> <if test="guid != null">guid,</if> <if test="textParam != null">text_param,</if> @@ -967,7 +972,6 @@ <if test="continueTimeNext != null ">continue_time_next,</if> <if test="continueContent != null ">continue_content,</if> <if test="operationItemId != null ">operation_item_id,</if> <if test="campusid != null">campusid,</if> <if test="scheduleId != null ">schedule_id,</if> <if test="scheduleDetailId != null ">schedule_detail_id,</if> <if test="scheduleSeq != null ">schedule_seq,</if> @@ -1000,7 +1004,8 @@ <if test="createTime != null">#{createTime},</if> <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> <if test="orgid != null and orgid != ''">#{orgid},</if> <if test="campusid != null and campusid != ''">#{campusid},</if> <if test="pid != null">#{pid},</if> <if test="guid != null">#{guid},</if> <if test="textParam != null">#{textParam},</if> @@ -1064,7 +1069,6 @@ <if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if> <if test="continueContent != null ">#{continueContent},</if> <if test="operationItemId != null ">#{operationItemId},</if> <if test="campusid != null">#{campusid},</if> <if test="scheduleId != null ">#{scheduleId},</if> <if test="scheduleDetailId != null ">#{scheduleDetailId},</if> <if test="scheduleSeq != null ">#{scheduleSeq},</if> @@ -1102,7 +1106,8 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="orgid != null and orgid != ''">orgid = #{orgid},</if> <if test="campusid != null and campusid != ''">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> @@ -1166,7 +1171,6 @@ <if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if> <if test="continueContent != null ">continue_content = #{continueContent},</if> <if test="operationItemId != null ">operation_item_id = #{operationItemId},</if> <if test="campusid != null">campusid=#{campusid},</if> <if test="scheduleId != null ">schedule_id = #{scheduleId},</if> <if test="scheduleDetailId != null ">schedule_detail_id = #{scheduleDetailId},</if> <if test="scheduleSeq != null ">schedule_seq = #{scheduleSeq},</if> @@ -1205,7 +1209,8 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="orgid != null and orgid != ''">orgid = #{orgid},</if> <if test="campusid != null and campusid != ''">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> @@ -1307,7 +1312,8 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="orgid != null and orgid != ''">orgid = #{orgid},</if> <if test="campusid != null and campusid != ''">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="visitCount != null">visit_count = #{visitCount},</if> @@ -1413,7 +1419,8 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="orgid != null and orgid != ''">orgid = #{orgid},</if> <if test="campusid != null and campusid != ''">campusid = #{campusid},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="textParam != null">text_param = #{textParam},</if> @@ -2375,8 +2382,11 @@ AND DATE_FORMAT(visit_time, '%Y-%m-%d') <= #{endDate} AND service_type IN (2, 13) AND del_flag = '0' <if test="orgid != null"> <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> AND campusid = #{campusid} </if> GROUP BY deptname </select> @@ -2422,10 +2432,12 @@ AND visit_time <= DATE_ADD(#{endDate}, INTERVAL 1 DAY) </if> <if test="orgid != null"> <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> AND campusid = #{campusid} </if> <if test="deptcodes != null and deptcodes.size() > 0"> AND deptcode IN <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")"> @@ -2479,10 +2491,12 @@ AND endtime <= DATE_ADD(#{endDate}, INTERVAL 1 DAY) </if> AND inhospstate=1 <if test="orgid != null"> <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> AND campusid = #{campusid} </if> <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0"> AND leavehospitaldistrictcode IN <foreach collection="leavehospitaldistrictcodes" item="districtcode" open="(" separator="," close=")"> @@ -2529,9 +2543,11 @@ <!-- AND admitdate <= DATE_ADD(#{endDate}, INTERVAL 1 DAY)--> <!-- </if>--> <!-- <if test="orgid != null">--> <!-- AND orgid = #{orgid}--> <!-- AND orgid = #{orgid}--> <!-- </if>--> <!-- <if test="campusid != null">--> <!-- AND campusid = #{campusid}--> <!-- </if>--> <!-- <if test="deptcodes != null and deptcodes.size() > 0">--> <!-- AND deptcode IN--> <!-- <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">--> @@ -2755,8 +2771,11 @@ where 1=1 and del_flag = 0 and service_type=3 <if test="orgid != null"> and orgid = #{orgid} <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> <if test="campusid != null and campusid != ''"> AND campusid = #{campusid} </if> <if test="startDate != null"> AND date_format( visit_time, '%y%m%d' ) >= date_format( #{startDate}, '%y%m%d' ) smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -30,6 +30,7 @@ <result property="isupload" column="isupload"/> <result property="uploadTime" column="upload_time"/> <result property="orgid" column="orgid"/> <result property="campusid" column="campusid"/> <result property="pid" column="pid"/> <result property="guid" column="guid"/> <result property="preachform" column="preachform"/> @@ -115,6 +116,7 @@ leavehospitaldistrictcode, leavehospitaldistrictname, orgid, campusid, nexttaskflag, nexttaskid, nexttaskname, @@ -161,6 +163,7 @@ <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if> <if test="compensateDate != null and compensateDate != ''">and compensate_date = #{compensateDate}</if> <if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if> <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if> @@ -252,7 +255,8 @@ service_task.nexttaskflag, service_task.nexttaskid, service_task.nexttaskname, service_task.orgid from service_task service_task.orgid, service_task.campusid from service_task where 1=1 and service_task.del_flag = 0 <!-- and taskid in (--> @@ -342,7 +346,8 @@ <if test="deptname != null and deptname != ''">and service_task.deptname = #{deptname}</if> <if test="isupload != null ">and service_task.isupload = #{isupload}</if> <if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if> <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and service_task.campusid = #{campusid}</if> <if test="compensateDate != null and compensateDate != ''">and service_task.compensate_date = #{compensateDate} </if> @@ -370,6 +375,7 @@ <if test="isupload != null ">and service_task.isupload = #{isupload}</if> <if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if> <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if> <if test="campusid != null and campusid != ''">and service_task.campusid = #{campusid}</if> <if test="compensateDate != null and compensateDate != ''">and service_task.compensate_date = #{compensateDate} </if> @@ -455,6 +461,7 @@ <if test="isupload != null">isupload,</if> <if test="uploadTime != null">upload_time,</if> <if test="orgid != null">orgid,</if> <if test="campusid != null and campusid != ''">campusid,</if> <if test="pid != null">pid,</if> <if test="guid != null">guid,</if> <if test="preachform != null">preachform,</if> @@ -508,6 +515,7 @@ <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> <if test="campusid != null and campusid != ''">#{campusid},</if> <if test="nexttaskflag != null">#{nexttaskflag},</if> <if test="nexttaskid != null">#{nexttaskid},</if> <if test="nexttaskname != null">#{nexttaskname},</if> @@ -568,6 +576,7 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="campusid != null and campusid != ''">campusid = #{campusid},</if> <if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if> <if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if> <if test="nexttaskname != null and nexttaskname!=''">nexttaskname = #{nexttaskname},</if>
