diff --git a/doc/gm_record.bak b/doc/gm_record.bak index 8307f3f..88e5a7a 100644 Binary files a/doc/gm_record.bak and b/doc/gm_record.bak differ diff --git a/src/main/java/com/emr/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java index e182d20..291628b 100644 --- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java @@ -29,6 +29,10 @@ public class Archive_Detail_Vo extends Archive_Detail{ private String sort; private String order; + + private String ids; + + private String pageCounts; } diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index a277d9c..9a1ee06 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -1,5 +1,7 @@ package com.emr.entity; +import java.math.BigDecimal; + public class Archive_Master { private String id; @@ -47,6 +49,8 @@ public class Archive_Master { private String changeReason; + private BigDecimal d1; + public String getChangeReason() { return changeReason; } @@ -231,6 +235,14 @@ public class Archive_Master { this.deptCodeLend = deptCodeLend == null ? null : deptCodeLend.trim(); } + public BigDecimal getD1() { + return d1; + } + + public void setD1(BigDecimal d1) { + this.d1 = d1; + } + @Override public String toString() { return "Archive_Master{" + @@ -257,6 +269,7 @@ public class Archive_Master { ", returntoRole='" + returntoRole + '\'' + ", returnOperUsername='" + returnOperUsername + '\'' + ", changeReason='" + changeReason + '\'' + + ", d1=" + d1 + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 71b9e97..ea9787c 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -27,6 +27,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -236,7 +238,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { try{ //执行查询 List selectList = new ArrayList<>(); - selectList = OracleConnect.selectList(sql); + try{ + //selectList = OracleConnect.selectList(sql); + }catch (Exception e){ + e.printStackTrace(); + ExceptionPrintUtil.printException(e); + } for (Archive_Master_Vo masterVo : list) { masterVo.setRemark("未签收"); //赋值 @@ -345,6 +352,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } for (Archive_Master_Vo vo:list) { + //转换总费用d1 + BigDecimal d1 = vo.getD1(); + if(d1 != null) { + java.text.DecimalFormat myformat=new java.text.DecimalFormat("0.00"); + String d1Str = myformat.format(d1); + }else{ + vo.setD1(new BigDecimal(0)); + } //科室名称编码转名称 DeptNameCode2Name(dictionaries, vo); //赋值出院天数 diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index b3486a8..1566e31 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -1,184 +1,222 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, PDF_PATH, MasterID, UpLoadDateTime, AssortID, Source, SubAssort, Title, flag, Sys - - - - - - + SELECT z.assort_id,z.assort_name,z.assort_sort,z.print_flag,s.pageNum,( + SELECT + STUFF ( + ( + SELECT + ',' + CONVERT ( VARCHAR ( 500 ), id ) + FROM + archive_detail + where + AssortID = z.assort_id + + and MasterID=#{patientId,jdbcType=VARCHAR} + + FOR XML path ( '' ) + ), + 1, + 1, + '' + ) + ) ids,( + SELECT + STUFF ( + ( + SELECT + ',' + CONVERT ( VARCHAR ( 255 ), isnull(PageCount,0) ) + FROM + archive_detail + where + AssortID = z.assort_id + + and MasterID=#{patientId,jdbcType=VARCHAR} + + FOR XML path ( '' ) + ), + 1, + 1, + '' + ) + ) pageCounts from(select AssortID,count(*) pageNum from + archive_detail + -- MasterID='a72163dd10e6443b90fb82384a1debf4' + where 1=1 + + and MasterID=#{patientId,jdbcType=VARCHAR} + + + and AssortID in (${assortid}) + + GROUP BY AssortID) s + RIGHT JOIN zd_assort z + on s.AssortID=z.assort_id + where s.pageNum>0 and print_flag = 0 + ORDER BY z.assort_sort + + + + + - - - - delete from archive_detail - where 1=1 - - and MasterID = #{masterid,jdbcType=NVARCHAR} - - - and AssortID = #{assortid,jdbcType=NVARCHAR} - - - and PDF_PATH = #{pdfPath,jdbcType=NVARCHAR} - - - + from archive_detail + left join zd_assort + on zd_assort.assort_id = archive_detail.AssortID + where 1=1 and flag=0 + + and id in (${title}) + + order by zd_assort.assort_sort,archive_detail.UpLoadDateTime + + + + + delete from archive_detail + where 1=1 + + and MasterID = #{masterid,jdbcType=NVARCHAR} + + + and AssortID = #{assortid,jdbcType=NVARCHAR} + + + and PDF_PATH = #{pdfPath,jdbcType=NVARCHAR} + + + delete from archive_detail where id = #{id,jdbcType=NVARCHAR} - + insert into archive_detail (id, PDF_PATH, MasterID, UpLoadDateTime, AssortID, Source, SubAssort, Title, flag, @@ -188,107 +226,107 @@ #{subassort,jdbcType=NVARCHAR}, #{title,jdbcType=NVARCHAR}, #{flag,jdbcType=NVARCHAR}, #{sys,jdbcType=NVARCHAR}) - - insert into archive_detail - - - id, - - - PDF_PATH, - - - MasterID, - - - UpLoadDateTime, - - - AssortID, - - - Source, - - - SubAssort, - - - Title, - - - flag, - - - Sys, - - - - - (select replace(newid(),'-','')), - - - #{pdfPath,jdbcType=NVARCHAR}, - - - #{masterid,jdbcType=NVARCHAR}, - - - #{uploaddatetime,jdbcType=NVARCHAR}, - - - #{assortid,jdbcType=NVARCHAR}, - - - #{source,jdbcType=NVARCHAR}, - - - #{subassort,jdbcType=NVARCHAR}, - - - #{title,jdbcType=NVARCHAR}, - - - #{flag,jdbcType=NVARCHAR}, - - - #{sys,jdbcType=NVARCHAR}, - - - - - update archive_detail - - - PDF_PATH = #{pdfPath,jdbcType=NVARCHAR}, - - - MasterID = #{masterid,jdbcType=NVARCHAR}, - - - UpLoadDateTime = #{uploaddatetime,jdbcType=NVARCHAR}, - - - AssortID = #{assortid,jdbcType=NVARCHAR}, - - - Source = #{source,jdbcType=NVARCHAR}, - - - SubAssort = #{subassort,jdbcType=NVARCHAR}, - - - Title = #{title,jdbcType=NVARCHAR}, - - - flag = #{flag,jdbcType=NVARCHAR}, - - - Sys = #{sys,jdbcType=NVARCHAR}, - - - where id = #{id,jdbcType=NVARCHAR} - - + + insert into archive_detail + + + id, + + + PDF_PATH, + + + MasterID, + + + UpLoadDateTime, + + + AssortID, + + + Source, + + + SubAssort, + + + Title, + + + flag, + + + Sys, + + + + + (select replace(newid(),'-','')), + + + #{pdfPath,jdbcType=NVARCHAR}, + + + #{masterid,jdbcType=NVARCHAR}, + + + #{uploaddatetime,jdbcType=NVARCHAR}, + + + #{assortid,jdbcType=NVARCHAR}, + + + #{source,jdbcType=NVARCHAR}, + + + #{subassort,jdbcType=NVARCHAR}, + + + #{title,jdbcType=NVARCHAR}, + + + #{flag,jdbcType=NVARCHAR}, + + + #{sys,jdbcType=NVARCHAR}, + + + + + update archive_detail + + + PDF_PATH = #{pdfPath,jdbcType=NVARCHAR}, + + + MasterID = #{masterid,jdbcType=NVARCHAR}, + + + UpLoadDateTime = #{uploaddatetime,jdbcType=NVARCHAR}, + + + AssortID = #{assortid,jdbcType=NVARCHAR}, + + + Source = #{source,jdbcType=NVARCHAR}, + + + SubAssort = #{subassort,jdbcType=NVARCHAR}, + + + Title = #{title,jdbcType=NVARCHAR}, + + + flag = #{flag,jdbcType=NVARCHAR}, + + + Sys = #{sys,jdbcType=NVARCHAR}, + + + where id = #{id,jdbcType=NVARCHAR} + + update archive_detail set PDF_PATH = #{pdfPath,jdbcType=NVARCHAR}, MasterID = #{masterid,jdbcType=NVARCHAR}, @@ -301,17 +339,17 @@ Sys = #{sys,jdbcType=NVARCHAR} where id = #{id,jdbcType=NVARCHAR} - - + SELECT archive_detail.id, zd_assort.assort_name subassort, archive_detail.AssortID, archive_detail.Title - FROM + FROM archive_detail - LEFT JOIN zd_assort ON archive_detail.AssortID = zd_assort.assort_id - WHERE + LEFT JOIN zd_assort ON archive_detail.AssortID = zd_assort.assort_id + WHERE archive_detail.flag != 1 AND archive_detail.MasterID = #{patientId} @@ -319,18 +357,18 @@ AND archive_detail.AssortID in (${assortIds}) - ORDER BY zd_assort.assort_sort - - - + + - - SELECT AssortID, MasterID @@ -346,8 +384,8 @@ AssortID, MasterID - - SELECT MID AS MasterID FROM @@ -359,36 +397,36 @@ GROUP BY MID - - select Source from archive_detail where MasterID = ${masterid} group by Source - - + SELECT + MasterID + FROM + archive_detail + + inner join archive_master + on archive_detail.MasterID = archive_master.id + + WHERE + - MasterID + MasterID - patient_id + patient_id - - IN ( - - ${item} - - ) - AND Source = '扫描上传' - GROUP BY - MasterID - + + IN ( + + ${item} + + ) + AND Source = '扫描上传' + GROUP BY + MasterID + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 6f8d439..370bf09 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -22,6 +22,7 @@ + @@ -322,12 +323,15 @@ - + + m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,m. + dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,m. + dept_admission_to,m.LockInfo,m.DOCTOR_IN_CHARGE,m.D1 + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index fc59f9d..eb10274 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -285,6 +285,9 @@
入院日期：
+
+ 总费用： 元 +
缺陷管理:
- - - + + + \ 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 3454a8e..bde22f0 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -448,7 +448,7 @@ - - - + + + \ 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 51b5d83..6b12596 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -354,7 +354,7 @@