From 184709e9b0ad8f98681e82003b2c59ca8ecab000 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Mon, 28 Sep 2020 15:52:01 +0800 Subject: [PATCH] =?UTF-8?q?20200929=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GlobalExceptionHandler.java | 52 +++ .../controller/beHospitaledController.java | 195 ++++++-- src/main/java/com/emr/controller/test.java | 43 -- .../emr/dao/ArchiveSumbitdateInfoMapper.java | 22 + .../com/emr/dao/Archive_DetailMapper.java | 3 + .../com/emr/entity/ArchiveSumbitdateInfo.java | 116 +++++ .../java/com/emr/util/ExceptionPrintUtil.java | 36 ++ src/main/java/com/emr/vo/HisCollectInfo.java | 4 + src/main/resources/config/jdbc.properties | 10 +- .../mapper/ArchiveSumbitdateInfoMapper.xml | 147 ++++++ .../resources/mapper/Archive_DetailMapper.xml | 8 + src/main/webapp/WEB-INF/jspf/comm.jspf | 4 +- src/main/webapp/WEB-INF/jspf/common.jspf | 2 +- .../views/beHospitaledDir/beHospList.jsp | 429 ++++++++++++------ .../views/inHospitalDir/inHositalList.jsp | 2 +- src/main/webapp/WEB-INF/views/index.jsp | 2 +- .../views/lastVerifyDir/lastVerifyList.jsp | 2 +- .../unfileMedicalDir/unfileMedicalList.jsp | 2 +- .../static/js/hospitalLoadPdf/loadPdf.js | 11 +- 19 files changed, 834 insertions(+), 256 deletions(-) create mode 100644 src/main/java/com/emr/controller/GlobalExceptionHandler.java delete mode 100644 src/main/java/com/emr/controller/test.java create mode 100644 src/main/java/com/emr/dao/ArchiveSumbitdateInfoMapper.java create mode 100644 src/main/java/com/emr/entity/ArchiveSumbitdateInfo.java create mode 100644 src/main/java/com/emr/util/ExceptionPrintUtil.java create mode 100644 src/main/resources/mapper/ArchiveSumbitdateInfoMapper.xml diff --git a/src/main/java/com/emr/controller/GlobalExceptionHandler.java b/src/main/java/com/emr/controller/GlobalExceptionHandler.java new file mode 100644 index 0000000..e289cf5 --- /dev/null +++ b/src/main/java/com/emr/controller/GlobalExceptionHandler.java @@ -0,0 +1,52 @@ +package com.emr.controller; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/5/15 16:14 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/5/15 16:14 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +import com.alibaba.fastjson.support.spring.FastJsonJsonView; +import com.emr.util.ExceptionPrintUtil; +import org.apache.shiro.authz.UnauthorizedException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.servlet.ModelAndView; + +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(value = Exception.class)//指定拦截的异常 + public ModelAndView errorHandler(Exception e){ + return returnMv(e,"服务器出错了,请联系系统管理员"); + } + @ExceptionHandler(value = RuntimeException.class)//指定拦截的异常 + public ModelAndView runtimeHandler(Exception e){ + return returnMv(e,"服务器出错了,请联系系统管理员"); + } + @ExceptionHandler(value = UnauthorizedException.class)//指定拦截的异常 + public ModelAndView unauthorizedHandler(Exception e){ + return returnMv(e,"您权限验证出错了,请联系系统管理员"); + } + private ModelAndView returnMv(Exception e,String msg){ + ModelAndView mv = new ModelAndView(); + /* 使用FastJson提供的FastJsonJsonView视图返回，不需要捕获异常 */ + FastJsonJsonView view = new FastJsonJsonView(); + Map attributes = new HashMap<>(1); + attributes.put("code", "500"); + attributes.put("msg", msg); + view.setAttributesMap(attributes); + mv.setView(view); + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return mv; + } +} diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 5c55a90..52bfed8 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -6,39 +6,45 @@ */ package com.emr.controller; +import com.alibaba.fastjson.JSON; +import com.emr.dao.ArchiveSumbitdateInfoMapper; +import com.emr.dao.Archive_DetailMapper; import com.emr.dao.Archive_MasterMapper; import com.emr.dao.EmrPatientMapper; -import com.emr.entity.Archive_Master; -import com.emr.entity.Archive_Master_Vo; -import com.emr.entity.Emr_Fault_Detail; -import com.emr.entity.OffsetLimitPage; +import com.emr.entity.*; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_Fault_DetailService; +import com.emr.util.ExceptionPrintUtil; import com.emr.util.ExportExcelUtil; import com.emr.util.Msg; import com.emr.util.OracleConnect; import com.emr.vo.HisCollectInfo; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; +import org.apache.log4j.Logger; import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @Controller @RequestMapping("/beHosp") public class beHospitaledController { + private static Logger log = Logger.getLogger("myLog"); @Autowired private Archive_MasterService archiveMasterService; @@ -47,35 +53,17 @@ public class beHospitaledController { @Autowired private EmrPatientMapper patientMapper; + + @Autowired + private ArchiveSumbitdateInfoMapper sumbitdateInfoMapper; @Value("${HomepageDictionary}") private String HomepageDictionary; @Value("${HomepageMethod}") private String HomepageMethod; @Autowired - private Archive_MasterMapper archive_masterMapper; - + private Archive_DetailMapper detailMapper; @RequestMapping(value = "/beHosps") public String inHospitals(Model model){ - /*try{ - File f=new File("D:\\a1222.txt"); - FileOutputStream fos1=new FileOutputStream(f); - OutputStreamWriter dos1=new OutputStreamWriter(fos1); - - - String str = ""; - List archive_masters = archive_masterMapper.selectAll(); - for (int i = 0; i < archive_masters.size(); i++) { - str += archive_masters.get(i).getInpNo()+System.getProperty("line.separator"); - } - dos1.write(str); - dos1.close(); - - }catch (Exception e){ - - }finally { - - }*/ - return "beHospitaledDir/beHospList"; } @ResponseBody @@ -216,11 +204,10 @@ public class beHospitaledController { @RequestMapping("getInfoFromHis") @ResponseBody //@DataSource(dataSource = "dataSource1") - public int getInfoFromHis(String patientId){ + public int getInfoFromHis(String patientId) throws Exception{ try { String sql = "select fpatno from pacs.v_emrpatient where fpatno = '"+patientId+"'"; String str = OracleConnect.select(sql); - System.out.println("str:"+str); if(StringUtils.isNoneBlank(str)){ return 1; }else{ @@ -237,20 +224,86 @@ public class beHospitaledController { * @param collectInfo * @return */ - @RequestMapping("getPdfCollectInfoFromHis") + @RequestMapping(value="getPdfCollectInfoFromHis",method = RequestMethod.POST) @ResponseBody - public int getPdfCollectInfoFromHis(HisCollectInfo collectInfo){ + public String getPdfCollectInfoFromHis(HisCollectInfo collectInfo){ try { String sql = getSelectSqlForGetPdfCollect(collectInfo); - List list = OracleConnect.select1(sql); + List list = new ArrayList<>(); + /*for (int i = 1; i <= 11; i++) { + HisCollectInfo obj1 = new HisCollectInfo(); + obj1.setFrecName("标题" + i); + obj1.setFentryNo((808+i)+""); + obj1.setFentryName("分类"+(808+i)); + obj1.setFfileId((4234+i)+""); + if(i>=2){ + obj1.setPdfflag("1"); + }else{ + obj1.setPdfflag("0"); + } + list.add(obj1); + }*/ + log.info("优先采集查询语句:"+sql); + try { + //查询oracle + list = OracleConnect.select1(sql); + }catch (Exception e){ + e.printStackTrace(); + ExceptionPrintUtil.printException(e); + log.error("优先采集查询oracle出错,请查看error.log文件"); + } + //赋值两时间：最近上传时间与最新手动提交时间 + setTwoTimeForList(list); + log.info("优先采集查询成功!"); + return JSON.toJSONString(list); } catch (Exception e) { e.printStackTrace(); + ExceptionPrintUtil.printException(e); + } + return null; + } + + //赋值两时间：最近上传时间与最新手动提交时间 + private void setTwoTimeForList(List list) { + if(!CollectionUtils.isEmpty(list)){ + StringBuilder fileIdsStr = new StringBuilder(); + for (int i = 0; i < list.size(); i++) { + String ffileId = list.get(i).getFfileId(); + if(i != 0){ + fileIdsStr.append(","); + } + fileIdsStr.append("'").append(ffileId).append("'"); + } + //查询detail表的上传时间 + List archiveDetails = detailMapper.selectUpdateTimeBySubAssort(fileIdsStr.toString()); + //查询archive_sumbitDate_info的提交时间 + List archiveSumbitdateInfoList = sumbitdateInfoMapper.selectOneByFileId(fileIdsStr.toString()); + if(!CollectionUtils.isEmpty(archiveDetails) || !CollectionUtils.isEmpty(archiveSumbitdateInfoList)){ + for (HisCollectInfo hisCollectInfo : list) { + String ffileId = hisCollectInfo.getFfileId(); + if(!CollectionUtils.isEmpty(archiveDetails)){ + for (Archive_Detail archiveDetail : archiveDetails) { + if (ffileId.equals(archiveDetail.getSubassort())) { + hisCollectInfo.setUpdateLoadTime(archiveDetail.getUploaddatetime()); + break; + } + } + } + if(!CollectionUtils.isEmpty(archiveSumbitdateInfoList)){ + for (ArchiveSumbitdateInfo info : archiveSumbitdateInfoList) { + if (ffileId.equals(info.getFileId())) { + hisCollectInfo.setSumbitTime(info.getCreateTime()); + break; + } + } + } + } + } } - return 1; } + //组织sql语句查询orcle查询文件完成情况 private String getSelectSqlForGetPdfCollect(HisCollectInfo collectInfo){ - collectInfo.setFpatno("4316993"); String sql = "select FENTRY_NO,FENTRY_NAME,FREC_NAME,FFILE_ID,PDF_FLAG from pacs.v_emrpdf_rec where fpatno = '"+collectInfo.getFpatno()+"'"; //标题 String frecName = collectInfo.getFrecName(); @@ -270,25 +323,71 @@ public class beHospitaledController { return sql; } - @RequestMapping("insetHisPdfCollect") + + /** + * 优先采集操作 + * @param fpatno + * @param fentryNos + * @param ffileIds + * @return + */ + @RequestMapping(value="insetHisPdfCollect",method = RequestMethod.POST) @ResponseBody - public Msg insetHisPdfCollect(){ + public Msg insetHisPdfCollect(String fpatno,String fentryNos,String ffileIds){ + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //现在时间 + String fapplytime = fmt.format(new Date()); + if(StringUtils.isBlank(fentryNos)){ + return Msg.fail("分类编号不能为空"); + } + if(StringUtils.isBlank(ffileIds)){ + return Msg.fail("文件id不能为空"); + } + String[] fentryNoList = fentryNos.split(","); + String[] ffileIdList = ffileIds.split(","); + for (int i = 0; i < fentryNoList.length; i++) { + if(StringUtils.isNotBlank(fentryNoList[i])){ + String sql = "insert into pacs.p_pdf_print(FENTRYNO,FPATNO,FAPPLYTIME,FFILE_ID) values('"+fentryNoList[i]+"','"+fpatno+"','"+fapplytime+"','"+ffileIdList[i]+"')"; + log.info("优先采集插入语句:"+sql); + try { + //OracleConnect.insert(sql); + log.info("优先采集插入oracle成功"); + }catch (Exception e){ + e.printStackTrace(); + log.info("优先采集插入oracle失败,请查看error.log文件"); + ExceptionPrintUtil.printException(e); + } + if (insertSubmitDateInfo(fapplytime, ffileIdList[i])){ + return Msg.fail("服务器内部出错,请联系系统管理员!"); + } + } + } + return Msg.success(); + } + + private boolean insertSubmitDateInfo(String fapplytime, String fileId) { + //插入记录 + ArchiveSumbitdateInfo info = new ArchiveSumbitdateInfo(); + info.setFileId(fileId); + //查询时候存在，存在更新，不存在添加 try { - //fentryno:分类编号 - String fentryno = "12345"; - //fpatno:记帐号 - String fpatno = "4316993"; - //fpatno:记帐号 - String fapplytime = "2020-03-04 11:22:22"; - //fpatno:记帐号 - String ffile_id = "2321321321321"; - String sql = "insert into pacs.p_pdf_print(FENTRYNO,FPATNO,FAPPLYTIME,FFILE_ID) values('"+fentryno+"','"+fpatno+"','"+fapplytime+"','"+ffile_id+"')"; - int str = OracleConnect.insert(sql); - System.out.println("str:"+str); - } catch (Exception e) { + List archiveSumbitdateInfoList = sumbitdateInfoMapper.selectOneByFileId("'"+ fileId +"'"); + info.setCreateTime(fapplytime); + if(!CollectionUtils.isEmpty(archiveSumbitdateInfoList)){ + ArchiveSumbitdateInfo archiveSumbitdateInfo = archiveSumbitdateInfoList.get(0); + archiveSumbitdateInfo.setCreateTime(fapplytime); + sumbitdateInfoMapper.updateByPrimaryKeySelective(archiveSumbitdateInfo); + }else{ + sumbitdateInfoMapper.insertSelective(info); + } + log.info("优先采集插入本地数据库成功"); + }catch (Exception e){ e.printStackTrace(); + ExceptionPrintUtil.printException(e); + log.error("优先采集插入本地数据库失败,请查看error.log文件"); + return true; } - return Msg.success(); + return false; } } diff --git a/src/main/java/com/emr/controller/test.java b/src/main/java/com/emr/controller/test.java deleted file mode 100644 index bd11385..0000000 --- a/src/main/java/com/emr/controller/test.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.emr.controller; - -import java.math.BigInteger; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -public class test { - public static void main(String[] args) throws Exception { - int data = 65504;//data表示要转换的数 - toNBigit(data,2); - } - private static void toNBigit(int data, int a) { - if(a>36||a<2){ - System.out.println("不支持此进制！！！"); - return; - } - if(data<0){ - data=((-1*data)^((1<<31)-1))+1;//将负数变为正数,再取反（^((1<<31)-1)即为取反）,最后再加1； - } - int n=(data%a); - int m=(data/a); - - if(m==0){ - printNBigitNum(n); - }else{ - toNBigit(m,a); - - printNBigitNum(n); - } - } - - private static void printNBigitNum(int n) { - if(n>9&&n<=36){ - System.out.print((char)((n-10)+65)); - }else if(n>36){ - System.out.println("不支持此进制！！！"); - return; - }else{ - System.out.print(n); - } - } -} diff --git a/src/main/java/com/emr/dao/ArchiveSumbitdateInfoMapper.java b/src/main/java/com/emr/dao/ArchiveSumbitdateInfoMapper.java new file mode 100644 index 0000000..ed8234d --- /dev/null +++ b/src/main/java/com/emr/dao/ArchiveSumbitdateInfoMapper.java @@ -0,0 +1,22 @@ +package com.emr.dao; + +import com.emr.entity.ArchiveSumbitdateInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ArchiveSumbitdateInfoMapper { + int deleteByPrimaryKey(Integer id); + + int insert(ArchiveSumbitdateInfo record); + + int insertSelective(ArchiveSumbitdateInfo record); + + ArchiveSumbitdateInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(ArchiveSumbitdateInfo record); + + int updateByPrimaryKey(ArchiveSumbitdateInfo record); + + List selectOneByFileId(@Param("fileId")String fileId); +} \ No newline at end of file diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index 863ba33..4fa09ef 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -2,6 +2,7 @@ package com.emr.dao; import com.emr.entity.Archive_Detail; import com.emr.entity.Archive_Detail_Vo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ public interface Archive_DetailMapper { List selectByIdStr(Archive_Detail record); + List selectUpdateTimeBySubAssort(@Param("subassort")String subassort); + } \ 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..d95e286 --- /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 fileId; + + 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 getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId == null ? null : fileId.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(", fileId=").append(fileId); + 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/util/ExceptionPrintUtil.java b/src/main/java/com/emr/util/ExceptionPrintUtil.java new file mode 100644 index 0000000..d1003b3 --- /dev/null +++ b/src/main/java/com/emr/util/ExceptionPrintUtil.java @@ -0,0 +1,36 @@ +package com.emr.util; + +import org.apache.log4j.Logger; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2020/8/4 14:18 + * @UpdateUser: 曾文和 + * @UpdateDate: 2020/8/4 14:18 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +public class ExceptionPrintUtil { + private static Logger log = Logger.getLogger("errorMsg"); + public static void printException(Exception e){ + //方法名 + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + e.printStackTrace(new PrintStream(baos)); + String exception = baos.toString(); + log.error(exception); + try { + baos.flush(); + baos.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } +} diff --git a/src/main/java/com/emr/vo/HisCollectInfo.java b/src/main/java/com/emr/vo/HisCollectInfo.java index c5228be..6a81358 100644 --- a/src/main/java/com/emr/vo/HisCollectInfo.java +++ b/src/main/java/com/emr/vo/HisCollectInfo.java @@ -15,4 +15,8 @@ public class HisCollectInfo { private String ffileId;//文件id private String pdfflag;//完成情况1:完成；0：未完成 + + private String updateLoadTime;//最近上传时间 + + private String sumbitTime;//最近提交时间 } diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 97af30f..98587d4 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,7 +1,7 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record jdbc.username=sa -jdbc.password=docus702 +jdbc.password=xjgs+docus911 #Oracle oracle.driver=oracle.jdbc.driver.OracleDriver @@ -25,11 +25,11 @@ pictureUrl=src\\main\\webapp #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #POWER_URLHEAD=http://120.27.212.36:8888/power #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power -powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag -POWER_URLHEAD=http://localhost:8080/power -POWER_JSP=http://localhost:8080/power +powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag +POWER_URLHEAD=http://10.36.116.108:8080/power +POWER_JSP=http://10.36.116.108:8080/power recallReason=医院需要这份文档 -HomepageDictionary=http://200.100.104.40:8081/filing/services/HomepageDictionary?wsdl +HomepageDictionary=http://10.36.116.108:8080/filing/services/HomepageDictionary?wsdl HomepageMethod=CheckData diff --git a/src/main/resources/mapper/ArchiveSumbitdateInfoMapper.xml b/src/main/resources/mapper/ArchiveSumbitdateInfoMapper.xml new file mode 100644 index 0000000..67e3bdd --- /dev/null +++ b/src/main/resources/mapper/ArchiveSumbitdateInfoMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + id, file_id, create_time, int1, int2, int3, str1, str2, str3 + + + + delete from archive_sumbitDate_info + where id = #{id,jdbcType=INTEGER} + + + insert into archive_sumbitDate_info (id, file_id, create_time, + int1, int2, int3, str1, + str2, str3) + values (#{id,jdbcType=INTEGER}, #{fileId,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, + #{int1,jdbcType=INTEGER}, #{int2,jdbcType=INTEGER}, #{int3,jdbcType=INTEGER}, #{str1,jdbcType=NVARCHAR}, + #{str2,jdbcType=NVARCHAR}, #{str3,jdbcType=NVARCHAR}) + + + insert into archive_sumbitDate_info + + + id, + + + file_id, + + + create_time, + + + int1, + + + int2, + + + int3, + + + str1, + + + str2, + + + str3, + + + + + #{id,jdbcType=INTEGER}, + + + #{fileId,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=VARCHAR}, + + + #{int1,jdbcType=INTEGER}, + + + #{int2,jdbcType=INTEGER}, + + + #{int3,jdbcType=INTEGER}, + + + #{str1,jdbcType=NVARCHAR}, + + + #{str2,jdbcType=NVARCHAR}, + + + #{str3,jdbcType=NVARCHAR}, + + + + + update archive_sumbitDate_info + + + file_id = #{fileId,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=VARCHAR}, + + + int1 = #{int1,jdbcType=INTEGER}, + + + int2 = #{int2,jdbcType=INTEGER}, + + + int3 = #{int3,jdbcType=INTEGER}, + + + str1 = #{str1,jdbcType=NVARCHAR}, + + + str2 = #{str2,jdbcType=NVARCHAR}, + + + str3 = #{str3,jdbcType=NVARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + update archive_sumbitDate_info + set file_id = #{fileId,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=VARCHAR}, + int1 = #{int1,jdbcType=INTEGER}, + int2 = #{int2,jdbcType=INTEGER}, + int3 = #{int3,jdbcType=INTEGER}, + str1 = #{str1,jdbcType=NVARCHAR}, + str2 = #{str2,jdbcType=NVARCHAR}, + str3 = #{str3,jdbcType=NVARCHAR} + where id = #{id,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 87294b0..3c3ad09 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -286,4 +286,12 @@ Sys = #{sys,jdbcType=NVARCHAR} where id = #{id,jdbcType=NVARCHAR} + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index 49c3a81..5429199 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -9,7 +9,7 @@ %> <%----%> - + <%----%> @@ -20,7 +20,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jspf/common.jspf b/src/main/webapp/WEB-INF/jspf/common.jspf index d2d9174..e2c400a 100644 --- a/src/main/webapp/WEB-INF/jspf/common.jspf +++ b/src/main/webapp/WEB-INF/jspf/common.jspf @@ -19,7 +19,7 @@ --%> <%----%> - + diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 88f4fe8..98d4f60 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -151,6 +151,24 @@ margin-top: 35%; width: 100%; } + .loading { + width: 160px; + height: 56px; + position: absolute; + top: 50%; + left: 50%; + line-height: 56px; + color: #fff; + padding-left: 60px; + font-size: 15px; + background: #000; + opacity: 0.7; + z-index: 9999; + -moz-border-radius: 20px; + -webkit-border-radius: 20px; + border-radius: 20px; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70); + } - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 9db8b77..1d8967a 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -1843,5 +1843,5 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index c6f82c3..7634418 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -298,7 +298,7 @@