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

超期天数的两个选项卡添加可查询条件，修改两个查询选项卡的主管医生由缓存表中获取，改为权限系统的用户列表获取

Browse Source
master
hujl 4 years ago
parent fbd29ec33d
commit 4a7a07b8b7
7 changed files with 213 additions and 125 deletions
Show Stats Download Patch File Download Diff File

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

@ -124,6 +124,8 @@ public class Archive_Master_Vo {
private String overdueDays;
private String overdueDaysTwo;//超期天数(查)
//2021-3-20 新增总分
private String score;
@ -214,6 +216,14 @@ public class Archive_Master_Vo {
this.overdueDays = overdueDays;
}
public String getOverdueDaysTwo() {
return overdueDaysTwo;
}
public void setOverdueDaysTwo(String overdueDaysTwo) {
this.overdueDaysTwo = overdueDaysTwo;
}
public String getCreateTimeStart() {
return createTimeStart;
}
@ -246,6 +256,8 @@ public class Archive_Master_Vo {
this.diffDay = diffDay;
}
public String getOverdue() {
return overdue;
}

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

@ -387,6 +387,32 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List<Archive_Master_Vo> selectOverdue(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
return list;
}
@ -395,38 +421,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
List<MedicalRecordHomepageCache> medicalRecordHomepageCacheList = null;
for (Archive_Master_Vo archive_master : list) {
String doctorInChargeInHomePage = "";
String directorDoctorInHomePage = "";
//根据masterId查出该条首页缓存表中content内容
MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample();
MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria();
if (!StringUtils.isEmpty(archive_master.getId())){
criteria.andMasterIdEqualTo(archive_master.getId());
}
medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample);
if (medicalRecordHomepageCacheList.size()>0){
//查出content
String content = medicalRecordHomepageCacheList.get(0).getContent();
//根据content内容获取首页中主治医生name、主任（副主任）医生name
doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054");
directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052");
}
//重新赋值主管医生、主任（副主任）医生
if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){
archive_master.setDoctorInCharge(doctorInChargeInHomePage);
}else {
archive_master.setDoctorInCharge("首页尚未填写主治医生！");
}
if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){
archive_master.setFirstInstance(directorDoctorInHomePage);
}else {
archive_master.setFirstInstance("首页尚未填写主任（副主任）医生！");
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
return new OffsetLimitPage((Page) list);
@ -435,6 +453,32 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
@Override
public List<Archive_Master_Vo> selectOverdue2(Archive_Master_Vo archiveMasterVo) {
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
return list;
}
@ -443,38 +487,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
PageHelper.offsetPage(offset, limit);
List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
List<MedicalRecordHomepageCache> medicalRecordHomepageCacheList = null;
for (Archive_Master_Vo archive_master : list) {
String doctorInChargeInHomePage = "";
String directorDoctorInHomePage = "";
//根据masterId查出该条首页缓存表中content内容
MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample();
MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria();
if (!StringUtils.isEmpty(archive_master.getId())){
criteria.andMasterIdEqualTo(archive_master.getId());
}
medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample);
if (medicalRecordHomepageCacheList.size()>0){
//查出content
String content = medicalRecordHomepageCacheList.get(0).getContent();
//根据content内容获取首页中主治医生name、主任（副主任）医生name
doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054");
directorDoctorInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable1").getString("yZY052");
}
//重新赋值主管医生、主任（副主任）医生
if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){
archive_master.setDoctorInCharge(doctorInChargeInHomePage);
}else {
archive_master.setDoctorInCharge("首页尚未填写主治医生！");
}
if (directorDoctorInHomePage != null && !directorDoctorInHomePage.equals("")){
archive_master.setFirstInstance(directorDoctorInHomePage);
}else {
archive_master.setFirstInstance("首页尚未填写主任（副主任）医生！");
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<Power_User_Dto> powerUserList = null;
if (!CollectionUtils.isEmpty(powerUsers)) {
//转换对象
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Archive_Master_Vo archiveMaster : list) {
if (null != powerUserList) {
//获取主管医生
String doctorInCharge = archiveMaster.getDoctorInCharge();
//获取 初审人
String firstInstance = archiveMaster.getFirstInstance();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(doctorInCharge) && powerUserDto.getUserName().equals(doctorInCharge)) {
archiveMaster.setDoctorInCharge(name);
}
if (StringUtils.isNotBlank(firstInstance) && powerUserDto.getUserName().equals(firstInstance)) {
archiveMaster.setFirstInstance(name);
}
}
}
}
return new OffsetLimitPage((Page) list);

3
src/main/resources/config/jdbc.properties
Unescape Escape View File

@ -2,10 +2,9 @@ POWER_IP=10.6.1.127
jdbc.username=sa
jdbc.password=docus@702
dataBaseName=DB_PrivilegeManagement_GYFY
POWER_PORT=9001
POWER_PORT=8080
jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName}
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect

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

@ -1437,6 +1437,18 @@
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!=''
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),m.discharge_date_time,23)),f.handle_time) , 0)-#{overdueDays,jdbcType=NCHAR}>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo == null or overdueDaysTwo == '') and (overdueDays != null and overdueDays != '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,substring(m.discharge_date_time,1,10)),f.handle_time) , 0)-#{overdueDays,jdbcType=NCHAR}>=0
</if>
<if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays == null or overdueDays == '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,substring(m.discharge_date_time,1,10)),f.handle_time) , 0)-3>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo == null or overdueDaysTwo == '') and (overdueDays == null or overdueDays == '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,substring(m.discharge_date_time,1,10)),f.handle_time) , 0)-3>=0
</if>
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
@ -1515,52 +1527,71 @@
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
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="deptName!= null and deptName!= ''">
and m.dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="deptAdmissionTo != null and deptAdmissionTo!=''">
and m.dept_admission_to in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) between #{startDate,jdbcType=NCHAR} and #{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) >=#{startDate,jdbcType=NCHAR}
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
<choose>
<when test="createTimeStart != null and createTimeStart != '' and createTimeEnd != null and createTimeEnd != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) between #{createTimeStart,jdbcType=NCHAR} and #{createTimeEnd,jdbcType=NCHAR}
</when>
<when test="createTimeStart != null and createTimeStart != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) >= #{createTimeStart,jdbcType=NCHAR}
</when>
<when test="createTimeEnd != null and createTimeEnd != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) &lt;= #{createTimeEnd,jdbcType=NCHAR}
</when>
</choose>
<if test="overdueDaysTwo != null and overdueDaysTwo != ''">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-'3'>#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="overdueDaysTwo == null or overdueDaysTwo == ''">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-'3'>0
</if>
<if test="overdueDaysTwo != null and overdueDaysTwo != '' and overdueDays != null and overdueDays != ''">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-#{overdueDays,jdbcType=NCHAR}>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo == null or overdueDaysTwo == '')and overdueDays != null and overdueDays != ''">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-#{overdueDays,jdbcType=NCHAR}>=0
</if>
<if test="overdueDaysTwo != null and overdueDaysTwo != '' and (overdueDays == null or overdueDays == '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-'3'>=#{overdueDaysTwo,jdbcType=NCHAR}
</if>
<if test="(overdueDaysTwo == null or overdueDaysTwo == '') and (overdueDays == null or overdueDays == '')">
and ISNULL(dbo.f_WorkDay(DATEADD(DAY,1,CONVERT(VARCHAR(10),f1.handle_time,23)),CONVERT(VARCHAR(10),f2.handle_time,23)) , 0)-'3'>=0
</if>
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR}
</if>
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="deptName!= null and deptName!= ''">
and m.dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="deptAdmissionTo != null and deptAdmissionTo!=''">
and m.dept_admission_to in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) between #{startDate,jdbcType=NCHAR} and #{endDate,jdbcType=NCHAR}
</when>
<when test="startDate != null and startDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) >=#{startDate,jdbcType=NCHAR}
</when>
<when test="endDate != null and endDate != ''">
and CONVERT(VARCHAR(20),m.discharge_date_time,23) &lt;= #{endDate,jdbcType=NCHAR}
</when>
</choose>
<choose>
<when test="createTimeStart != null and createTimeStart != '' and createTimeEnd != null and createTimeEnd != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) between #{createTimeStart,jdbcType=NCHAR} and #{createTimeEnd,jdbcType=NCHAR}
</when>
<when test="createTimeStart != null and createTimeStart != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) >= #{createTimeStart,jdbcType=NCHAR}
</when>
<when test="createTimeEnd != null and createTimeEnd != ''">
and CONVERT(VARCHAR(20),f1.handle_time,23) &lt;= #{createTimeEnd,jdbcType=NCHAR}
</when>
</choose>
</where>
ORDER BY m.master_id,m.discharge_date_time,f1.handle_time asc
</select>

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

@ -113,10 +113,6 @@
#{item}
</foreach>
</if>
<if test="creater != null and creater != ''">
and m.creater like '%'+#{creater,jdbcType=NCHAR}+'%'
</if>
<if test="doctorInCharge != null and doctorInCharge != ''">
and m.DOCTOR_IN_CHARGE like '%'+#{doctorInCharge,jdbcType=NCHAR}+'%'
</if>

8
src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
Unescape Escape View File

@ -736,7 +736,7 @@
var startDateTo=row.startDateTo;
var endDateTo=row.endDateTo;
var cur_table2 = $detail.html('<table id="faultTable"></table>').find('table');
console.log(archiveDetailId+"========"+archiveDetailId+"====="+startDateTo+"======="+endDateTo);
//console.log(archiveDetailId+"========"+archiveDetailId+"====="+startDateTo+"======="+endDateTo);
$(cur_table2).bootstrapTable({
//method: 'POST',
@ -921,15 +921,17 @@
if((startDate2==null || startDate2=="") && (endDate2==null || endDate2=="")&& (inpNo2==null || inpNo2=="") && (visitId2==null || visitId2=="")
&& (name2==null || name2=="") && (doctorInCharge2==null || doctorInCharge2=="") && (archivestate2==null || archivestate2=="") && (deptName2==null || deptName2=="")){
if((typeFlag2!=null && typeFlag2!="") || (creater2!=null || creater2!="") ){
if((typeFlag2!=null && typeFlag2!="") || (creater2!=null && creater2!="") ){
$("#faultTable").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
}else{
$("#backTable").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
//$("#backTable").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
}
}else{
$("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新
}
//$('#table').bootstrapTable('refresh');
} else {
toastr.warning("正在查询，请稍等...");

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

@ -121,9 +121,13 @@
<input type="text" class="input-sm form-control" name="end" id="createTimeEnd"/>
</div>
</div>
<div class="form-group divCss8">
<label>超期天数(查)</label>
<input type="text" class="input-sm form-control" id="overdueDays4" placeholder="请输入超期天数">
</div>
<div class="form-group divCss8">
<label>超期天数>=</label>
<input type="text" class="input-sm form-control" id="overdueDays" placeholder="请输入超期天数">
<input type="text" class="input-sm form-control" id="overdueDays" placeholder="请输入配置超期天数">
</div>
<%--<div class="form-group divCss">
<label>是否死亡:</label>
@ -212,9 +216,13 @@
<input type="text" class="input-sm form-control" name="end2" id="createTimeEnd2"/>
</div>
</div>
<div class="form-group divCss8">
<label>超期天数(查)</label>
<input type="text" class="input-sm form-control" id="overdueDays3" placeholder="请输入超期天数">
</div>
<div class="form-group divCss8">
<label>超期天数>=</label>
<input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请输入超期天数">
<input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请输入配置超期天数">
</div>
<%--<div class="form-group divCss">
<label>是否死亡:</label>
@ -442,7 +450,8 @@
createTimeStart: $("#createTimeStart").val(),
createTimeEnd: $("#createTimeEnd").val(),
deathFlag: $("#deathFlag").val(),
overdueDays: $("#overdueDays").val()
overdueDays: $("#overdueDays").val(),
overdueDaysTwo: $("#overdueDays4").val()
};
return temp;
@ -631,11 +640,12 @@
var createTimeEnd= $("#createTimeEnd").val();
var deathFlag= $("#deathFlag").val();
var overdueDays= $("#overdueDays").val();
var overdueDaysTwo= $("#overdueDays4").val();
window.location.href = "${path}/medicalOverdue/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo
//+ "&archivestate=" + archivestate
+ "&createTimeStart=" + createTimeStart + "&createTimeEnd=" + createTimeEnd+ "&startDate=" + startDate
+ "&endDate=" + endDate+ "&deathFlag=" + deathFlag + "&overdueDays=" + overdueDays;
+ "&endDate=" + endDate+ "&deathFlag=" + deathFlag + "&overdueDays=" + overdueDays+ "&overdueDaysTwo=" + overdueDaysTwo;
});
function enter() {
@ -732,7 +742,8 @@
createTimeStart: $("#createTimeStart2").val(),
createTimeEnd: $("#createTimeEnd2").val(),
deathFlag: $("#deathFlag2").val(),
overdueDays: $("#overdueDays2").val()
overdueDays: $("#overdueDays2").val(),
overdueDaysTwo: $("#overdueDays3").val(),
};
return temp;
@ -941,11 +952,12 @@
var createTimeEnd= $("#createTimeEnd2").val();
var deathFlag= $("#deathFlag2").val();
var overdueDays= $("#overdueDays2").val();
var overdueDaysTwo= $("#overdueDays3").val();
window.location.href = "${path}/medicalOverdue/exportExcel2?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo
//+ "&archivestate=" + archivestate
+ "&createTimeStart=" + createTimeStart + "&createTimeEnd=" + createTimeEnd+ "&startDate=" + startDate
+ "&endDate=" + endDate+ "&deathFlag=" + deathFlag + "&overdueDays=" + overdueDays;
+ "&endDate=" + endDate+ "&deathFlag=" + deathFlag + "&overdueDays=" + overdueDays+ "&overdueDaysTwo=" + overdueDaysTwo;
});
function enter2() {

Write Preview
Loading…
Cancel
Save