emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/resources/mapper/Archive_MasterMapper.xml
master
wengjx 3 years ago
parent f1f213fd8a cf861572e6
commit 5c0a1dd635
9 changed files with 113 additions and 94 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/emr/controller/medicalOverdueController.java
Unescape Escape View File

@ -341,7 +341,6 @@ public class medicalOverdueController {
@RequestMapping(value = "/getTimeoutDay")
public long getWorkDayBetweenStartAndEnd(GetTime getTime) throws ParseException {
int i = archiveMasterService.selectWorkDateNum(getTime);
System.out.println("i:::::::::"+i);
return i;
}

7
src/main/java/com/emr/dao/Archive_MasterMapper.java
Unescape Escape View File

@ -156,10 +156,17 @@ public interface Archive_MasterMapper {
*/
List<Archive_Master_Vo> selectOverdue2(Archive_Master_Vo record);
Archive_Master_Vo againTime(String masterId);
// Archive_Master_Vo againOverdueTime(String masterId);
//封存日志
List<Archive_Master_Vo> selectByFollowinglog(Archive_Master_Vo record);
/**
* 查询病案是否存在
* */

4
src/main/java/com/emr/entity/Archive_Master_Vo.java
Unescape Escape View File

@ -17,6 +17,8 @@ import java.util.List;
public class Archive_Master_Vo {
private String id;
private String masterId;
private String patientId;
private String inpNo;
@ -104,6 +106,8 @@ public class Archive_Master_Vo {
private String handleName;//handle_name
private String againTime;
private String handleTime;//handle_time
private String startHandleTime;

45
src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
Unescape Escape View File

@ -554,6 +554,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
Date date1=null;
Date date2=null;
Date date3=null;
String overdueDaysTwo = archiveMasterVo.getOverdueDaysTwo();
if (overdueDaysTwo.equals("")){
archiveMasterVo.setOverdueDaysTwo("4");
}else {
int inum = Integer.parseInt(overdueDaysTwo);
int inum2=inum+1;
String s=String.valueOf(inum2);
archiveMasterVo.setOverdueDaysTwo(s);
}
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
if(list!=null && list.size()>0) {
//查询用户集合
@ -581,12 +591,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
} catch (ParseException e) {
e.printStackTrace();
}
System.out.println("date3::::"+date3);
Calendar ca1 = Calendar.getInstance();
Calendar ca2 = Calendar.getInstance();
ca1.setTime(date1);
ca2.setTime(date2);
long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
int i= (int)distanceMin;
archiveMasterVo.setDischargeDateTime1(date3);
// Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo);
@ -661,7 +671,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date date1=null;
Date date2=null;
PageHelper.offsetPage(offset, limit);
String overdueDaysTwo = archiveMasterVo.getOverdueDaysTwo();
if (overdueDaysTwo.equals("")){
archiveMasterVo.setOverdueDaysTwo("4");
}else {
int inum = Integer.parseInt(overdueDaysTwo);
int inum2=inum+1;
String s=String.valueOf(inum2);
archiveMasterVo.setOverdueDaysTwo(s);
}
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
if(list!=null && list.size()>0) {
//查询用户集合
@ -673,6 +695,27 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
// Archive_Master_Vo archive_master_vo = archiveMasterMapper.againTime(masterId);
String overTime1 = archiveMaster.getOverTime1();
String handleTime = archiveMaster.getAgainTime();
try {
date1=format.parse(overTime1);
date2=format.parse(handleTime);
} catch (ParseException e) {
e.printStackTrace();
}
Calendar ca1 = Calendar.getInstance();
Calendar ca2 = Calendar.getInstance();
ca1.setTime(date1);
ca2.setTime(date2);
long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
int i= (int)distanceMin;
if (i>0){
archiveMaster.setOverTime(i);
}else {
archiveMaster.setOverTime(0);
}
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();

114
src/main/resources/mapper/Archive_MasterMapper.xml
Unescape Escape View File

@ -74,6 +74,7 @@
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
<result column="doctor_name" jdbcType="NVARCHAR" property="doctorName"/>
<result column="master_id" jdbcType="NVARCHAR" property="masterId"/>
<result column="nurse_name" jdbcType="NVARCHAR" property="nurseName"/>
<result column="cmt_doctor_date" jdbcType="NVARCHAR" property="cmtDoctorDate"/>
<result column="cmt_nurse_date" jdbcType="NVARCHAR" property="cmtNurseDate"/>
@ -111,10 +112,6 @@
<result column="overTime2" jdbcType="INTEGER" property="overTime2" />
<result column="flag" jdbcType="INTEGER" property="flag" />
<result column="countNum" jdbcType="INTEGER" property="countNum" />
<result column="C1" jdbcType="NVARCHAR" property="C1" />
<result column="C9" jdbcType="NVARCHAR" property="C9" />
<result column="T3" jdbcType="NVARCHAR" property="T3" />
</resultMap>
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
@ -1476,7 +1473,7 @@
f.id,f.handle_name,f.handle_id,f.handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),m.discharge_date_time,23),CONVERT(VARCHAR(20),f.handle_time,23)),
0) diffDay,
(SELECT max(b.date)
FROM (select top 4 date from emr_holiday_set where date >= CONVERT (
FROM (select top ${overdueDaysTwo} date from emr_holiday_set where date >= CONVERT (
VARCHAR (10),
m.discharge_date_time,
120
@ -1512,12 +1509,15 @@
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
on m.dept_admission_to=e.code
<where> 1=1 and m.master_id!='' and m.master_id is not null
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
and ISNULL( datediff(day,convert(varchar(100),m.mid_date,23),convert(varchar(100),f.handle_time,23)),0)+ISNULL(m.dayOne,0)-1-cast(#{overdueDays,jdbcType=NCHAR} as int)>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays == null or overdueDays == '')">
and ISNULL( datediff(day,convert(varchar(100),m.mid_date,23),convert(varchar(100),f.handle_time,23)),0)+ISNULL(m.dayOne,0)-1-3>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<!--<if test="(overdueDaysTwo != null and overdueDaysTwo != '') ">-->
<!--and-->
<!--DATEDIFF(dd,(SELECT max(b.date)-->
<!--FROM (select top 4 date from emr_holiday_set where date >= CONVERT (-->
<!--VARCHAR (10),-->
<!--m.discharge_date_time,-->
<!--120-->
<!--) and flag= 1 order by date asc) as b), CONVERT(VARCHAR(20),f.handle_time,23)) >=#{overdueDaysTwo,jdbcType=NCHAR}-->
<!--</if>-->
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
@ -1569,7 +1569,13 @@
</select>
<!-- 住院返修病历 -->
<select id="selectOverdue2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select f1.id,f1.following_content,f1.handle_name,CONVERT(VARCHAR(20),f1.handle_time,120) handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),f1.handle_time,23),CONVERT(VARCHAR(20),f2.handle_time,23)), 0) diffDay,
select f1.id,f1.following_content,f1.handle_name,CONVERT(VARCHAR(20),f1.handle_time,120) handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),f1.handle_time,23),CONVERT(VARCHAR(20),f2.handle_time,23)), 0) diffDay,f2.handle_time as againTime,
(SELECT max(b.date)
FROM (select top ${overdueDaysTwo} date from emr_holiday_set where date >= CONVERT (
VARCHAR (10),
f1.handle_time,
120
) and flag= 1 order by date asc) as b) as overTime1,
<if test="overdueDays != null and overdueDays != ''">
case
when ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)&lt;=0
@ -1621,12 +1627,15 @@
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
on m.dept_admission_to=e.code
<where> 1=1 and m.master_id!='' and m.master_id is not null and f2.handle_time is not null
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
and ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)+ISNULL(f2.dayOne,0)-1-cast(#{overdueDays,jdbcType=NCHAR} as int)>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays == null or overdueDays == '')">
and ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)+ISNULL(f2.dayOne,0)-1-3>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<!--<if test="(overdueDaysTwo != null and overdueDaysTwo != '') ">-->
<!--and-->
<!--DATEDIFF(dd,(SELECT max(b.date)-->
<!--FROM (select top 4 date from emr_holiday_set where date >= CONVERT (-->
<!--VARCHAR (10),-->
<!--f1.handle_time,-->
<!--120-->
<!--) and flag= 1 order by date asc) as b), CONVERT(VARCHAR(20),f2.handle_time,23)) >=#{overdueDaysTwo,jdbcType=NCHAR}-->
<!--</if>-->
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
@ -2195,65 +2204,18 @@
<select id="selectTime1" resultType="java.lang.Integer" parameterType="com.emr.entity.Archive_Master_Vo">
select flag from emr_holiday_set where date =#{dischargeDateTime1}
</select>
<select id="againTime" resultType="com.emr.entity.Archive_Master_Vo" parameterType="java.lang.String">
(SELECT max(b.date)
FROM (select top 4 date from emr_holiday_set where date >= CONVERT (
VARCHAR (10),
( select Max (handle_time) from Archive_Master_Following where
Archive_Master_Following.following_type='9' and Archive_Master_Following.master_id=#{masterId}),
120
) and flag= 1 order by date asc) as b) as overTime1
from Archive_Master_Following where Archive_Master_Following.following_type='5' and Archive_Master_Following.master_id=#{masterId}
GROUP BY master_id
</select>
<select id="selectArchiveMasterVoAndExt" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.inp_no inpNo, m.visit_id visitId,m.name name,m.discharge_date_time dischargeDateTime,
ex.C1 C1, ex.C9 C9, ex.T3 T3
from archive_master m LEFT JOIN archive_other_ext ex on m.id = ex.MID
<where>
1=1
<if test="inpNo != null and inpNo != ''">
AND inp_no LIKE '%' + #{inpNo} + '%'
</if>
<if test="name != null and name != ''">
AND name LIKE '%' + #{name} + '%'
</if>
<if test="visitId != null and visitId != ''">
AND visit_id LIKE '%' + #{visitId} + '%'
</if>
<!-- <if test="startDate != null and startDate != ''">-->
<!-- and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)-->
<!-- </if>-->
<!-- <if test="endDate != null and endDate != ''">-->
<!-- and m.discharge_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'-->
<!-- </if>-->
<if test="dischargeDateTime != null">
and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
</if>
<choose>
<when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and
#{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startDateTo != null and startDateTo != ''">
and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
</when>
<when test="endDateTo != null and endDateTo != ''">
and m.discharge_date_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</where>
</select>
</mapper>

2
src/main/resources/mapper/Emr_Fault_DetailMapper.xml
Unescape Escape View File

@ -320,7 +320,7 @@
left join(select * from emr_fault_detail t where id = (select top 1 id from emr_fault_detail where archive_detail_id = t.archive_detail_id order by create_time desc )
and state in('已召回','未召回')) f
ON f.archive_detail_id=m.id
left join v_printinfo p ON m.id=p.masterID
left join archive_printinfo p ON m.id=p.MasterID
where 1=1 and m.Is_Valid!=1
<if test="archiveDetailId != null">
and f.archive_detail_id = #{archiveDetailId,jdbcType=NVARCHAR}

16
src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
Unescape Escape View File

@ -532,10 +532,10 @@
<input type="text" class="input-sm form-control" name="end" id="endDateTo4"/>
</div>
</div>
<div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">
<label>超期天数></label>
<input type="text" class="input-sm form-control" id="overdue1" placeholder="请配置超期天数(默认3)">
</div>
<%--<div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">--%>
<%--<label>超期天数></label>--%>
<%--<input type="text" class="input-sm form-control" id="overdue1" placeholder="请配置超期天数(默认3)">--%>
<%--</div>--%>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn4">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn4">条件导出</button>
</div>
@ -588,10 +588,10 @@
<input type="text" class="input-sm form-control" name="end" id="endDateTo5"/>
</div>
</div>
<div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">
<label>超期天数></label>
<input type="text" class="input-sm form-control" id="overdue2" placeholder="请配置超期天数(默认3)">
</div>
<%--<div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">--%>
<%--<label>超期天数></label>--%>
<%--<input type="text" class="input-sm form-control" id="overdue2" placeholder="请配置超期天数(默认3)">--%>
<%--</div>--%>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn5">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn5">条件导出</button>
</div>

16
src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
Unescape Escape View File

@ -228,10 +228,10 @@
<label>超期天数(查)>=</label>
<input type="text" class="input-sm form-control" id="overdueDays3" placeholder="请输入超期天数">
</div>
<div class="form-group divCss">
<label>超期天数>=</label>
<input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请配置超期天数(默认3)">
</div>
<%--<div class="form-group divCss">--%>
<%--<label>超期天数>=</label>--%>
<%--<input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请配置超期天数(默认3)">--%>
<%--</div>--%>
<%--<div class="form-group divCss">
<label>是否死亡:</label>
<select class="input-sm form-control" id="deathFlag">
@ -844,6 +844,12 @@
return result;
}*/
},
{
title: '再次提交时间',
field: 'againTime',
align: 'center',
valign: 'middle',
},
{
title: '退回人',
field: 'handleName',
@ -890,7 +896,7 @@
},
{
title: '超期天数',
field: 'overdue',
field: 'overTime',
align: 'center',
valign: 'middle',
/* formatter: function (value, row, index) {

2
src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
Unescape Escape View File

@ -762,8 +762,6 @@
//提醒是否使用
if (vprintinfoId != null && vprintinfoId != "" && vprintinfoId != "null"){
alert("已使用");
}else {
alert("未使用");
}
}

Write Preview
Loading…
Cancel
Save