diff --git a/src/main/java/com/example/duplicate/controller/ZJYYController.java b/src/main/java/com/example/duplicate/controller/ZJYYController.java index 362588e..f74af0d 100644 --- a/src/main/java/com/example/duplicate/controller/ZJYYController.java +++ b/src/main/java/com/example/duplicate/controller/ZJYYController.java @@ -69,9 +69,9 @@ public class ZJYYController { } - @RequestMapping(value = "com" , method = RequestMethod.POST) + @RequestMapping(value = "com" , method = RequestMethod.GET) @ResponseBody - public String com(String mid){ + public String com(){ List com = commomtableMapper.com(); for (CommomtableCopyVo list:com){ StringBuffer sb=new StringBuffer(); diff --git a/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java b/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java index 9f42d62..96cbb5d 100644 --- a/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java +++ b/src/main/java/com/example/duplicate/controller/vo/AddArchiveMasterVo.java @@ -17,28 +17,26 @@ public class AddArchiveMasterVo { private String ID; - + //病案id private String patientId; - + //住院号 private String inpNo; - + //住院次数 private String visitId; - + //患者姓名 private String name; - + //出院科室名称 private String deptName; - + //出院时间 private String dischargeDateTime; - + //病历状态 private String ArchiveState; - + //住院时间 private String admissionDateTime; - + //完整性 private String LockInfo; - private String DISCHARGEDISPOSITION; - - + //拆分标识 private String splitName; diff --git a/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java b/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java index 8fbe0fb..11d0eaa 100644 --- a/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java +++ b/src/main/java/com/example/duplicate/controller/vo/CommomtableCopyVo.java @@ -12,17 +12,25 @@ import lombok.Data; public class CommomtableCopyVo { private String id; + //患者姓名 private String name; + //住院号 private String inpatientNo; + //住院次数 private String admissTimes; + //出院时间 private String disDate; + //图像号 private String pageNumber; + //旧病案号 private String inpatientNoPast; + //出院科室 private String disDept; + //盘号 private String ph; - + //盘号格式 private String phString; - + //拆分状态 private int spilStatic; } diff --git a/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java b/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java index 822b70c..3022ae4 100644 --- a/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java +++ b/src/main/java/com/example/duplicate/controller/vo/ZdAssortVo.java @@ -10,24 +10,23 @@ import lombok.Data; */ @Data public class ZdAssortVo { - + //分段id private String assortId; + //分段名称 private String assortName; - + //分段排序 private String assortSort; - + //打印标识 private String printFlag; - + //病案id private String patientId; - - private String DISCHARGEDISPOSITION; - + //文件路径 private String PDFPATH; - + //标识 private String flag; - + //来源 private String Sys; - + //最近更新时间 private String UpLoadDateTime; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dd955b2..ffebfd6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ spring: # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # type: com.alibaba.druid.pool.DruidDataSource db1: #数据源1 - jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=yd_record + jdbc-url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=zj_record_new username: sa password: admin123 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver