| smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/ServiceTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -438,11 +438,17 @@ private String wechat; /** * 诊断名称 * 出院诊断编码 */ @Excel(name = " 诊断名称") @ApiModelProperty(value = "诊断名称") private String diagname; @Excel(name = " 出院诊断编码") @ApiModelProperty(value = "出院诊断编码") private String leaveicd10code; /** * 出院诊断名称 */ @Excel(name = " 出院诊断名称") @ApiModelProperty(value = "出院诊断名称") private String leavediagname; /** * 患者ID smartor/src/main/java/com/smartor/domain/ServiceTask.java
@@ -409,4 +409,22 @@ @ApiModelProperty(value = "是否循环执行患者（0:不循环 1：循环）") private Long patCycle; /** * 是否有下个任务，用于多任务关联 */ @ApiModelProperty(value = "是否有下个任务（0:无 1：有）") @Excel(name = "是否有下个任务（0:无 1：有）") private String nexttaskflag; /** * 下一个任务id */ @ApiModelProperty(value = "下一个任务id") @Excel(name = " 下一个任务id") private Long nexttaskid; /** * 下一个任务名称 */ @ApiModelProperty(value = "下一个任务名称") @Excel(name = " 下一个任务名称") private String nexttaskname; } smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -349,4 +349,22 @@ @ApiModelProperty(value = "是否循环执行患者（0:不循环 1：循环）") private Long patCycle = 0L; /** * 是否有下个任务，用于多任务关联 */ @ApiModelProperty(value = "是否有下个任务（0:无 1：有）") @Excel(name = "是否有下个任务（0:无 1：有）") private String nexttaskflag; /** * 下一个任务id */ @ApiModelProperty(value = "下一个任务id") @Excel(name = " 下一个任务id") private Long nexttaskid; /** * 下一个任务名称 */ @ApiModelProperty(value = "下一个任务名称") @Excel(name = " 下一个任务名称") private String nexttaskname; } smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -50,7 +50,8 @@ <result property="hospno" column="hospno"/> <result property="hospType" column="hosp_type"/> <result property="wechat" column="wechat"/> <result property="diagname" column="diagname"/> <result property="leaveicd10code" column="leaveicd10code"/> <result property="leavediagname" column="leavediagname"/> <result property="deptname" column="deptname"/> <result property="admindate" column="admindate"/> <result property="roomno" column="roomno"/> @@ -153,7 +154,7 @@ stop_state, leavehospitaldistrictcode, leavehospitaldistrictname, diagname leavediagname,leaveicd10code from service_subtask </sql> @@ -312,7 +313,8 @@ <if test="roomno != null and roomno != ''">roomno,</if> <if test="admindate != null and admindate != ''">admindate,</if> <if test="deptname != null and deptname != ''">deptname,</if> <if test="diagname != null and diagname != ''">diagname,</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if> <if test="leavediagname != null and leavediagname != ''">leavediagname,</if> <if test="libtemplateid != null ">libtemplateid,</if> <if test="libtemplatename != null ">libtemplatename,</if> <if test="patid != null ">patid,</if> @@ -385,7 +387,8 @@ <if test="roomno != null and roomno != ''">#{roomno},</if> <if test="admindate != null and admindate != ''">#{admindate},</if> <if test="deptname != null and deptname != ''">#{deptname},</if> <if test="diagname != null and diagname != ''">#{diagname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if> <if test="libtemplateid != null ">#{libtemplateid},</if> <if test="libtemplatename != null ">#{libtemplatename},</if> <if test="patid != null ">#{patid},</if> @@ -462,7 +465,8 @@ <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> <if test="patid != null ">patid = #{patid},</if> @@ -540,7 +544,8 @@ <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> <if test="patid != null ">patid = #{patid},</if> @@ -619,7 +624,8 @@ <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> <if test="patid != null ">patid = #{patid},</if> @@ -697,7 +703,8 @@ <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if> <if test="patid != null ">patid = #{patid},</if> @@ -838,7 +845,8 @@ inhospid, patfrom, task_guid, diagname leavediagname, leaveicd10code FROM service_subtask, JSON_TABLE(send_time_slot, '$[*]' COLUMNS ( begantime DATETIME PATH '$.begantime', smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -54,6 +54,9 @@ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/> <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/> <result property="compensateDate" column="compensate_date"/> <result property="nexttaskflag" column="nexttaskflag"/> <result property="nexttaskid" column="nexttaskid"/> <result property="nexttaskname" column="nexttaskname"/> </resultMap> <sql id="selectServiceTaskVo"> @@ -104,7 +107,10 @@ jsy, leavehospitaldistrictcode, leavehospitaldistrictname, orgid orgid, nexttaskflag, nexttaskid, nexttaskname from service_task </sql> @@ -154,6 +160,9 @@ <if test="sendState != null ">and send_state = #{sendState}</if> <if test="compensateDate != null ">and compensate_date = #{compensateDate}</if> <if test="patCycle != null ">and pat_cycle = #{patCycle}</if> <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if> <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if> <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if> <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = #{leavehospitaldistrictname} </if> @@ -229,6 +238,9 @@ service_task.leavehospitaldistrictcode, service_task.leavehospitaldistrictname, service_task.pat_cycle, service_task.nexttaskflag, service_task.nexttaskid, service_task.nexttaskname, service_task.orgid from service_task <where> service_task.del_flag=0 @@ -297,6 +309,9 @@ <if test="sendState != null ">and service_task.send_state = #{sendState}</if> <if test="compensateDate != null ">and service_task.compensate_date = #{compensateDate}</if> <if test="patCycle != null ">and service_task.pat_cycle = #{patCycle}</if> <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if> <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if> <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if> <if test="leavehospitaldistrictname != null ">and service_task.leavehospitaldistrictname = #{leavehospitaldistrictname} </if> @@ -389,6 +404,9 @@ <if test="isupload != null">#{isupload},</if> <if test="uploadTime != null">#{uploadTime},</if> <if test="orgid != null">#{orgid},</if> <if test="nexttaskflag != null">#{nexttaskflag},</if> <if test="nexttaskid != null">#{nexttaskid},</if> <if test="nexttaskname != null">#{nexttaskname},</if> <if test="pid != null">#{pid},</if> <if test="guid != null">#{guid},</if> <if test="preachform != null">#{preachform},</if> @@ -442,6 +460,9 @@ <if test="isupload != null">isupload = #{isupload},</if> <if test="uploadTime != null">upload_time = #{uploadTime},</if> <if test="orgid != null">orgid = #{orgid},</if> <if test="nexttaskflag != null">#{nexttaskflag},</if> <if test="nexttaskid != null">#{nexttaskid},</if> <if test="nexttaskname != null">#{nexttaskname},</if> <if test="pid != null">pid = #{pid},</if> <if test="guid != null">guid = #{guid},</if> <if test="preachform != null">preachform = #{preachform},</if>
