diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java new file mode 100644 index 0000000..8dc4303 --- /dev/null +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -0,0 +1,35 @@ +package com.emr.controller; + +import com.emr.entity.OffsetLimitPage; +import com.emr.service.ipml.ArchiveOtherExtService; +import com.emr.util.ExceptionPrintUtil; +import com.emr.vo.ArchiveFlowInfoVo; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +@Controller +@RequestMapping("archiveExt/") +public class ArchiveOtherExtController { + @Autowired + private ArchiveOtherExtService archiveOtherExtService; + @RequestMapping("getArchiveExtInfo") + @ResponseBody + public OffsetLimitPage getArchiveExtInfo(Integer offset, Integer limit){ + PageHelper.offsetPage(offset,limit); + try { + List list = null; + //List list = archiveOtherExtService.getArchiveExtInfo(archiveOtherExtVo); + return new OffsetLimitPage((Page) list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } +} diff --git a/src/main/java/com/emr/entity/ArchiveOtherExt.java b/src/main/java/com/emr/entity/ArchiveOtherExt.java new file mode 100644 index 0000000..ce7dd0c --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveOtherExt.java @@ -0,0 +1,382 @@ +package com.emr.entity; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class ArchiveOtherExt implements Serializable { + private Long id; + + private Date syctime; + + private String sycobj; + + private Long otherid; + + private Integer sysflag; + + private Date sysupdatetime; + + private String jzh; + + private String zyh; + + private Date stime; + + private Date etime; + + private Integer statusflag; + + private String presult; + + private String mid; + + private String did; + + private String c1; + + private String c2; + + private String c3; + + private String c4; + + private String c5; + + private String c6; + + private String c7; + + private String c8; + + private String c9; + + private String c10; + + private BigDecimal n1; + + private BigDecimal n2; + + private BigDecimal n3; + + private Date t1; + + private Date t2; + + private Date t3; + + private Date t4; + + private Date t5; + + private Date t6; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Date getSyctime() { + return syctime; + } + + public void setSyctime(Date syctime) { + this.syctime = syctime; + } + + public String getSycobj() { + return sycobj; + } + + public void setSycobj(String sycobj) { + this.sycobj = sycobj == null ? null : sycobj.trim(); + } + + public Long getOtherid() { + return otherid; + } + + public void setOtherid(Long otherid) { + this.otherid = otherid; + } + + public Integer getSysflag() { + return sysflag; + } + + public void setSysflag(Integer sysflag) { + this.sysflag = sysflag; + } + + public Date getSysupdatetime() { + return sysupdatetime; + } + + public void setSysupdatetime(Date sysupdatetime) { + this.sysupdatetime = sysupdatetime; + } + + public String getJzh() { + return jzh; + } + + public void setJzh(String jzh) { + this.jzh = jzh == null ? null : jzh.trim(); + } + + public String getZyh() { + return zyh; + } + + public void setZyh(String zyh) { + this.zyh = zyh == null ? null : zyh.trim(); + } + + public Date getStime() { + return stime; + } + + public void setStime(Date stime) { + this.stime = stime; + } + + public Date getEtime() { + return etime; + } + + public void setEtime(Date etime) { + this.etime = etime; + } + + public Integer getStatusflag() { + return statusflag; + } + + public void setStatusflag(Integer statusflag) { + this.statusflag = statusflag; + } + + public String getPresult() { + return presult; + } + + public void setPresult(String presult) { + this.presult = presult == null ? null : presult.trim(); + } + + public String getMid() { + return mid; + } + + public void setMid(String mid) { + this.mid = mid == null ? null : mid.trim(); + } + + public String getDid() { + return did; + } + + public void setDid(String did) { + this.did = did == null ? null : did.trim(); + } + + public String getC1() { + return c1; + } + + public void setC1(String c1) { + this.c1 = c1 == null ? null : c1.trim(); + } + + public String getC2() { + return c2; + } + + public void setC2(String c2) { + this.c2 = c2 == null ? null : c2.trim(); + } + + public String getC3() { + return c3; + } + + public void setC3(String c3) { + this.c3 = c3 == null ? null : c3.trim(); + } + + public String getC4() { + return c4; + } + + public void setC4(String c4) { + this.c4 = c4 == null ? null : c4.trim(); + } + + public String getC5() { + return c5; + } + + public void setC5(String c5) { + this.c5 = c5 == null ? null : c5.trim(); + } + + public String getC6() { + return c6; + } + + public void setC6(String c6) { + this.c6 = c6 == null ? null : c6.trim(); + } + + public String getC7() { + return c7; + } + + public void setC7(String c7) { + this.c7 = c7 == null ? null : c7.trim(); + } + + public String getC8() { + return c8; + } + + public void setC8(String c8) { + this.c8 = c8 == null ? null : c8.trim(); + } + + public String getC9() { + return c9; + } + + public void setC9(String c9) { + this.c9 = c9 == null ? null : c9.trim(); + } + + public String getC10() { + return c10; + } + + public void setC10(String c10) { + this.c10 = c10 == null ? null : c10.trim(); + } + + public BigDecimal getN1() { + return n1; + } + + public void setN1(BigDecimal n1) { + this.n1 = n1; + } + + public BigDecimal getN2() { + return n2; + } + + public void setN2(BigDecimal n2) { + this.n2 = n2; + } + + public BigDecimal getN3() { + return n3; + } + + public void setN3(BigDecimal n3) { + this.n3 = n3; + } + + public Date getT1() { + return t1; + } + + public void setT1(Date t1) { + this.t1 = t1; + } + + public Date getT2() { + return t2; + } + + public void setT2(Date t2) { + this.t2 = t2; + } + + public Date getT3() { + return t3; + } + + public void setT3(Date t3) { + this.t3 = t3; + } + + public Date getT4() { + return t4; + } + + public void setT4(Date t4) { + this.t4 = t4; + } + + public Date getT5() { + return t5; + } + + public void setT5(Date t5) { + this.t5 = t5; + } + + public Date getT6() { + return t6; + } + + public void setT6(Date t6) { + this.t6 = t6; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", syctime=").append(syctime); + sb.append(", sycobj=").append(sycobj); + sb.append(", otherid=").append(otherid); + sb.append(", sysflag=").append(sysflag); + sb.append(", sysupdatetime=").append(sysupdatetime); + sb.append(", jzh=").append(jzh); + sb.append(", zyh=").append(zyh); + sb.append(", stime=").append(stime); + sb.append(", etime=").append(etime); + sb.append(", statusflag=").append(statusflag); + sb.append(", presult=").append(presult); + sb.append(", mid=").append(mid); + sb.append(", did=").append(did); + sb.append(", c1=").append(c1); + sb.append(", c2=").append(c2); + sb.append(", c3=").append(c3); + sb.append(", c4=").append(c4); + sb.append(", c5=").append(c5); + sb.append(", c6=").append(c6); + sb.append(", c7=").append(c7); + sb.append(", c8=").append(c8); + sb.append(", c9=").append(c9); + sb.append(", c10=").append(c10); + sb.append(", n1=").append(n1); + sb.append(", n2=").append(n2); + sb.append(", n3=").append(n3); + sb.append(", t1=").append(t1); + sb.append(", t2=").append(t2); + sb.append(", t3=").append(t3); + sb.append(", t4=").append(t4); + sb.append(", t5=").append(t5); + sb.append(", t6=").append(t6); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/ArchiveSumbitdateInfo.java b/src/main/java/com/emr/entity/ArchiveSumbitdateInfo.java new file mode 100644 index 0000000..e227324 --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveSumbitdateInfo.java @@ -0,0 +1,116 @@ +package com.emr.entity; + +import java.io.Serializable; + +public class ArchiveSumbitdateInfo implements Serializable { + private Integer id; + + private String extId; + + private String createTime; + + private Integer int1; + + private Integer int2; + + private Integer int3; + + private String str1; + + private String str2; + + private String str3; + + private static final long serialVersionUID = 1L; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getExtId() { + return extId; + } + + public void setExtId(String extId) { + this.extId = extId == null ? null : extId.trim(); + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime == null ? null : createTime.trim(); + } + + public Integer getInt1() { + return int1; + } + + public void setInt1(Integer int1) { + this.int1 = int1; + } + + public Integer getInt2() { + return int2; + } + + public void setInt2(Integer int2) { + this.int2 = int2; + } + + public Integer getInt3() { + return int3; + } + + public void setInt3(Integer int3) { + this.int3 = int3; + } + + public String getStr1() { + return str1; + } + + public void setStr1(String str1) { + this.str1 = str1 == null ? null : str1.trim(); + } + + public String getStr2() { + return str2; + } + + public void setStr2(String str2) { + this.str2 = str2 == null ? null : str2.trim(); + } + + public String getStr3() { + return str3; + } + + public void setStr3(String str3) { + this.str3 = str3 == null ? null : str3.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", extId=").append(extId); + sb.append(", createTime=").append(createTime); + sb.append(", int1=").append(int1); + sb.append(", int2=").append(int2); + sb.append(", int3=").append(int3); + sb.append(", str1=").append(str1); + sb.append(", str2=").append(str2); + sb.append(", str3=").append(str3); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java new file mode 100644 index 0000000..7afcd73 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -0,0 +1,16 @@ +package com.emr.service.ipml; + +import com.emr.vo.ArchiveFlowInfoVo; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +public class ArchiveOtherExtService { + public List getArchiveExtInfo() { + //return archiveOtherExtMapper.getArchiveExtInfo(archiveOtherExtVo); + return null; + } +} diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 456ce8c..ec2d4a6 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -316,7 +316,7 @@
病历信息
@@ -313,7 +315,7 @@
- <%----%> + @@ -696,21 +698,21 @@
-
+
-
-
- @@ -727,12 +729,12 @@
- +
-
+
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index 6161558..46bc5ea 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -198,6 +198,8 @@ function initTable() { idArr = []; //同步 $("#idLab").html(row.id); + //记账号 + $("#patientId").val(row.patientId); $("#nameLab").html(row.name); if (row.admissionDateTime != null && row.admissionDateTime != '') { $("#inDateLab").html(operDisTime(row.admissionDateTime)); diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index a0da39a..8770a0e 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1008,7 +1008,7 @@ function initTable5() { $("#table5").bootstrapTable("destroy"); $("#table5").bootstrapTable({ // 对应table标签的id //method: 'POST', - url: path+"/inHosp/getAssortdetail", // 获取表格数据的url + url: path+"/archiveExt/getArchiveExtInfo", // 获取表格数据的url contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求,注释掉这句话也能拿到数据 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true @@ -1040,9 +1040,6 @@ function initTable5() { } var limit = null; var offset = params.offset; - var patientId = $("#idLab").html(); - var assortId = $("#assortId").html(); - if (assortId == 0) assortId = null; //判断是否导出全部all if ($("#sel_exportoption").val() == "all") { offset = 0; @@ -1058,36 +1055,52 @@ function initTable5() { offset: offset, //页码 sort:params.sort, order: params.order, //排位命令(desc,asc) - patientId: patientId, - assortId: assortId, - checker:$("#checker").val(), - source:$("#source").val(), - title:$("#title").val() + patientId: $("#patientId").val(), + c1: $("#c1").val(), + statusflag:$("#statusflag").val(), + statusflag:$("#statusflag").val() }; return temp; }, - columns: [{ - title: '全选', - field: 'select', //复选框 - checkbox: true, - width: 25, - align: 'center', - hidden: true, - }, { - title: '序', - field: 'id', - align: 'left', - visible: false - }, + columns: [ + { + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'center', + hidden: true, + }, + { + title: "操作", + align: 'left', + valign: 'middle', + width: 120, // 定义列的宽度,单位为像素px + formatter: function (value, row, index) { + var html = ''; + return html; + }, + events: { + 'click .editInfo': function (e, value, row, index) { + + } + } + }, + { + title: '序', + field: 'id', + align: 'left', + visible: false + }, { title: '标题', - field: 'title', + field: 'c1', align: 'left', valign: 'middle' }, { - title: '最新修改', - field: 'uploaddatetime', + title: '最近修改', + field: '', align: 'left', valign: 'middle', sortable: true, @@ -1095,7 +1108,7 @@ function initTable5() { }, { title: '同步时间', - field: 'uploaddatetime', + field: 'sysupdatetime', align: 'left', valign: 'middle', sortable: true, @@ -1103,21 +1116,21 @@ function initTable5() { }, { title: '状态', - field: '', + field: 'statusflag', align: 'left', valign: 'middle', width: 150, // 定义列的宽度,单位为像素px }, { title: '备注', - field: '', + field: 'presult', align: 'left', valign: 'middle', width: 150, // 定义列的宽度,单位为像素px }, { title: '来源', - field: 'source', + field: 'sysflag', align: 'center', valign: 'middle', sortable: true, @@ -1125,7 +1138,7 @@ function initTable5() { }, { title: '开始时间', - field: 'uploaddatetime', + field: 'stime', align: 'left', valign: 'middle', sortable: true, @@ -1133,54 +1146,11 @@ function initTable5() { }, { title: '结束时间', - field: 'uploaddatetime', + field: 'etime', align: 'left', valign: 'middle', sortable: true, width: 150, // 定义列的宽度,单位为像素px - }, - { - title: "操作", - align: 'left', - valign: 'middle', - width: 120, // 定义列的宽度,单位为像素px - formatter: function (value, row, index) { - //return ''; - var html = ''; - return html; - }, events: { - 'click .editInfo': function (e, value, row, index) { - $('#assortModal').modal({ - backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - - //同步 - $("#inpId").val(row.id); - $("#inpTitle").val(row.title); - //下拉类别 - getZdAssort(); - $("#inpType").val(row.assortId); - $("#inpSource").val(row.source); - $("#inpFlag").val(row.flag); - if (row.pdfPath != "" && row.pdfPath != "") { - $("#fileUrlInp").val(row.pdfPath); - $('#previewFile').css("display", "block");//显示预览按钮 - } - }, 'click .stateInfo': function (e, value, row, index) { - $('#exampleModal').modal({ - backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - //同步 - $("#idT").val(row.id); - } - }, - cellStyle: function (value, row, index) { - return {classes: 'success'} - } } ], onLoadSuccess: function (result) { //加载成功时执行