From b5fde8deea80ab892165ae26e652d1caf38a399e Mon Sep 17 00:00:00 2001 From: leijx <1477272687@qq.com> Date: Tue, 5 Jan 2021 08:45:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=202=E3=80=81=E7=97=85=E6=A1=88=E9=A6=96=E9=A1=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BD=8F=E9=99=A2=E5=8F=B7=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ann/demo/controller/TestController.java | 16 +- .../ann/demo/entity/constant/AliasName.java | 144 ++++---- .../demo/entity/interfaceEntity/EMRData.java | 41 --- .../entity/interfaceEntity/ExamApply.java | 50 --- .../interfaceEntity/InspectionApply.java | 39 --- .../entity/interfaceEntity/MessageLog.java | 2 +- .../interfaceEntity/UltrasonicReport.java | 97 ----- .../demo/entity/normalEntity/CommonTable.java | 22 +- .../entity/normalEntity/CommonTable1.java | 330 ++++++++++++++++-- .../demo/entity/normalEntity/DiagDetail.java | 5 +- .../demo/entity/normalEntity/OperDetail.java | 21 +- .../demo/entity/normalEntity/OtherData.java | 261 ++------------ .../ann/demo/entity/normalEntity/User.java | 70 ---- .../ann/demo/entity/normalEntity/User3.java | 82 ----- .../demo/interfaces/HomepageDictionary.java | 5 - .../impl/HomepageDictionaryImpl.java | 66 +--- .../demo/repository/DepartmentRepository.java | 18 - .../repository/EMRDictionaryRepository.java | 18 - .../demo/repository/ExamApplyRepository.java | 26 -- .../ann/demo/repository/UserRepository.java | 15 - .../com/ann/demo/service/AnalysisService.java | 43 +-- .../ann/demo/service/DepartmentService.java | 19 - .../demo/service/EMRDictionaryService.java | 16 - .../ann/demo/service/ExamApplyService.java | 22 -- .../com/ann/demo/service/UserService.java | 17 - .../service/impl/DepartmentServiceImpl.java | 52 --- .../impl/EMRDictionaryServiceImpl.java | 49 --- .../service/impl/ExamApplyServiceImpl.java | 40 --- ...MedicalRecordHomepageCacheServiceImpl.java | 4 +- .../MedicalRecordHomepageServiceImpl.java | 2 +- .../demo/service/impl/UserServiceImpl.java | 67 ---- .../java/com/ann/demo/utils/PinYinUtils.java | 2 - .../java/com/ann/demo/utils/XMLUtils.java | 141 +------- 33 files changed, 453 insertions(+), 1349 deletions(-) delete mode 100644 src/main/java/com/ann/demo/entity/interfaceEntity/EMRData.java delete mode 100644 src/main/java/com/ann/demo/entity/interfaceEntity/ExamApply.java delete mode 100644 src/main/java/com/ann/demo/entity/interfaceEntity/InspectionApply.java delete mode 100644 src/main/java/com/ann/demo/entity/interfaceEntity/UltrasonicReport.java delete mode 100644 src/main/java/com/ann/demo/entity/normalEntity/User.java delete mode 100644 src/main/java/com/ann/demo/entity/normalEntity/User3.java delete mode 100644 src/main/java/com/ann/demo/repository/DepartmentRepository.java delete mode 100644 src/main/java/com/ann/demo/repository/EMRDictionaryRepository.java delete mode 100644 src/main/java/com/ann/demo/repository/ExamApplyRepository.java delete mode 100644 src/main/java/com/ann/demo/repository/UserRepository.java delete mode 100644 src/main/java/com/ann/demo/service/DepartmentService.java delete mode 100644 src/main/java/com/ann/demo/service/EMRDictionaryService.java delete mode 100644 src/main/java/com/ann/demo/service/ExamApplyService.java delete mode 100644 src/main/java/com/ann/demo/service/UserService.java delete mode 100644 src/main/java/com/ann/demo/service/impl/DepartmentServiceImpl.java delete mode 100644 src/main/java/com/ann/demo/service/impl/EMRDictionaryServiceImpl.java delete mode 100644 src/main/java/com/ann/demo/service/impl/ExamApplyServiceImpl.java delete mode 100644 src/main/java/com/ann/demo/service/impl/UserServiceImpl.java diff --git a/src/main/java/com/ann/demo/controller/TestController.java b/src/main/java/com/ann/demo/controller/TestController.java index 1e0cab6..60fb396 100644 --- a/src/main/java/com/ann/demo/controller/TestController.java +++ b/src/main/java/com/ann/demo/controller/TestController.java @@ -1,26 +1,14 @@ package com.ann.demo.controller; import com.ann.demo.entity.constant.InterfaceName; -import com.ann.demo.entity.interfaceEntity.ArchiveMaster; import com.ann.demo.service.AnalysisService; -import com.ann.demo.service.UserService; -import com.ann.demo.utils.PinYinUtils; -import com.ann.demo.utils.XMLUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpRequest; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; import java.util.Objects; import java.util.concurrent.*; @@ -35,8 +23,6 @@ public class TestController { @Autowired AnalysisService analysisService; - @Autowired - UserService userService; @RequestMapping("/demo") public String aa() { @@ -119,7 +105,7 @@ public class TestController { @RequestMapping("/dd") public String dd() { - analysisService.delete(); + //analysisService.delete(); return "不要生气了！！！"; } diff --git a/src/main/java/com/ann/demo/entity/constant/AliasName.java b/src/main/java/com/ann/demo/entity/constant/AliasName.java index 9619155..064c530 100644 --- a/src/main/java/com/ann/demo/entity/constant/AliasName.java +++ b/src/main/java/com/ann/demo/entity/constant/AliasName.java @@ -10,36 +10,36 @@ import java.util.*; */ public class AliasName { - public static final String USER = "用户字典"; - - public static final String DEPARTMENT = "科室字典"; - - // 超声报告 - public static final String ULTRASONIC_REPORT = "57"; - - // 病理检查报告单 - public static final String PATHOLOGY_REPORT = "52"; - - // 放射诊断报告单 54 - public static final String RADIATION_REPORT = "54"; - - // 心电图报告单 59 - public static final String EKG_REPORT = "59"; - - // 入院记录 - public static final String ADMISSION_RECORD = "9"; - - // 出院记录 - public static final String DISCHARGE_RECORD = "113"; - - // 转科记录 - public static final String TRANSFER_RECORD = "114"; - - // 取消入院 - public static final String CANCELLATION_DISCHARGE = "115"; - - // 患者更新 - public static final String PATIENT_UPDATE = "124"; +// public static final String USER = "用户字典"; +// +// public static final String DEPARTMENT = "科室字典"; +// +// // 超声报告 +// public static final String ULTRASONIC_REPORT = "57"; +// +// // 病理检查报告单 +// public static final String PATHOLOGY_REPORT = "52"; +// +// // 放射诊断报告单 54 +// public static final String RADIATION_REPORT = "54"; +// +// // 心电图报告单 59 +// public static final String EKG_REPORT = "59"; +// +// // 入院记录 +// public static final String ADMISSION_RECORD = "9"; +// +// // 出院记录 +// public static final String DISCHARGE_RECORD = "113"; +// +// // 转科记录 +// public static final String TRANSFER_RECORD = "114"; +// +// // 取消入院 +// public static final String CANCELLATION_DISCHARGE = "115"; +// +// // 患者更新 +// public static final String PATIENT_UPDATE = "124"; // 手麻 public static final String HANDNUMBNESS_REPORT = "117"; @@ -48,65 +48,65 @@ public class AliasName { public static final String ICU_REPORT = "121"; // 其他类型 目前来说 是手麻系统的其他三个 - public static final String OTHER = "18"; +// public static final String OTHER = "18"; // 检查申请单 - public static final String PARAMETER_EXAMAPPLY = "119"; +// public static final String PARAMETER_EXAMAPPLY = "119"; // 输血单 public static final String BLOODAPPLY_REPORT = "120"; // PET/CT报告单 - public static final String PETCT_REPORT = "60"; +// public static final String PETCT_REPORT = "60"; // 检验申请单 - public static final String PARAMETER_INSPECTIONAPPLY = "118"; - - // 检验报告 - public static final String INSPECTION_REPORT = "10"; +// public static final String PARAMETER_INSPECTIONAPPLY = "118"; - // 扫描文件 - public static final String SCANNING_FILE = "30"; +// // 检验报告 +// public static final String INSPECTION_REPORT = "10"; +// +// // 扫描文件 +// public static final String SCANNING_FILE = "30"; // 护理、医生 - public static final Map DOCTOR_MAP; - public static final Map NURSE_MAP; +// public static final Map DOCTOR_MAP; +// public static final Map NURSE_MAP; // 病案首页 public static final String MEDICAL_RECORD_HOMEPAGE = "3"; // 20191021 申请单变更状态 - public static final String EXAM_APPLY_STATE_CHANGE = "31"; - - static { - DOCTOR_MAP = new HashMap(); - DOCTOR_MAP.put("入院记录", "9"); - DOCTOR_MAP.put("病程记录", "11"); - DOCTOR_MAP.put("术前文书", "12"); - DOCTOR_MAP.put("手术资料", "13"); - DOCTOR_MAP.put("讨论记录", "14"); - DOCTOR_MAP.put("会诊记录", "15"); - DOCTOR_MAP.put("出院记录", "113"); - DOCTOR_MAP.put("死亡记录", "17"); - DOCTOR_MAP.put("VTE文书", "23"); - DOCTOR_MAP.put("其他记录", "18"); - DOCTOR_MAP.put("医护共用", "19"); - DOCTOR_MAP.put("知情同意", "20"); - DOCTOR_MAP.put("疾病危重", "21"); - DOCTOR_MAP.put("VTE记录", "22"); - DOCTOR_MAP.put("病案首页", "3"); - DOCTOR_MAP.put("病历文书", ""); - - NURSE_MAP = new HashMap(); - NURSE_MAP.put("首次护理记录", "7"); - NURSE_MAP.put("护理文书", "6"); - NURSE_MAP.put("专科单护理", "24"); - NURSE_MAP.put("知情文件", "8"); - NURSE_MAP.put("体温单", "5"); - NURSE_MAP.put("护理记录", "2"); - NURSE_MAP.put("评估单", "4"); - NURSE_MAP.put("病历护理文书", ""); - } +// public static final String EXAM_APPLY_STATE_CHANGE = "31"; + +// static { +// DOCTOR_MAP = new HashMap(); +// DOCTOR_MAP.put("入院记录", "9"); +// DOCTOR_MAP.put("病程记录", "11"); +// DOCTOR_MAP.put("术前文书", "12"); +// DOCTOR_MAP.put("手术资料", "13"); +// DOCTOR_MAP.put("讨论记录", "14"); +// DOCTOR_MAP.put("会诊记录", "15"); +// DOCTOR_MAP.put("出院记录", "113"); +// DOCTOR_MAP.put("死亡记录", "17"); +// DOCTOR_MAP.put("VTE文书", "23"); +// DOCTOR_MAP.put("其他记录", "18"); +// DOCTOR_MAP.put("医护共用", "19"); +// DOCTOR_MAP.put("知情同意", "20"); +// DOCTOR_MAP.put("疾病危重", "21"); +// DOCTOR_MAP.put("VTE记录", "22"); +// DOCTOR_MAP.put("病案首页", "3"); +// DOCTOR_MAP.put("病历文书", ""); +// +// NURSE_MAP = new HashMap(); +// NURSE_MAP.put("首次护理记录", "7"); +// NURSE_MAP.put("护理文书", "6"); +// NURSE_MAP.put("专科单护理", "24"); +// NURSE_MAP.put("知情文件", "8"); +// NURSE_MAP.put("体温单", "5"); +// NURSE_MAP.put("护理记录", "2"); +// NURSE_MAP.put("评估单", "4"); +// NURSE_MAP.put("病历护理文书", ""); +// } } diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/EMRData.java b/src/main/java/com/ann/demo/entity/interfaceEntity/EMRData.java deleted file mode 100644 index 4e1c4ea..0000000 --- a/src/main/java/com/ann/demo/entity/interfaceEntity/EMRData.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ann.demo.entity.interfaceEntity; - -import lombok.Data; - -import java.util.Date; - -/** - * @Author: LeiJiaXin - * @Date: 2019/9/10 10:04 - */ -@Data -public class EMRData { - // 2019-9-28 新增id - private String applyId; - - private Date xmlCreateTime; - - private String inpNo; - - private String visitId; - - private String patientId; - - // 病历文书 - private String type; - - private String reportAddress; - - private String lastModifyTime; - - private String commitTime; - - // 知情同意 - private String subType; - - // 知情同意下面的类型 - private String detailType; - - //排序的时间 - private String captionDateTime; -} diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/ExamApply.java b/src/main/java/com/ann/demo/entity/interfaceEntity/ExamApply.java deleted file mode 100644 index b1bba4e..0000000 --- a/src/main/java/com/ann/demo/entity/interfaceEntity/ExamApply.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ann.demo.entity.interfaceEntity; - -import lombok.Data; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.util.Date; - -/** - * 检查申请单 - * - * @Author: LeiJiaXin - * @Date: 2019/8/22 15:42 - */ -@Data -@Table -@Entity -public class ExamApply { - - @Id - private String applyId; - - private Date xmlCreateTime; - - private String inpNo; - - private String visitId; - - private String patientId; - - private Date authorReportTime; - - private String result; - - private Integer isValid = 0; - - /** - * 病理、放射、心电、超声、内镜 - */ - private String reportType; - - - /** - * 2019-10-21 新增是否开立接口 E 检查 F 取消检查 - */ - private String isOpen = "0"; - - -} diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/InspectionApply.java b/src/main/java/com/ann/demo/entity/interfaceEntity/InspectionApply.java deleted file mode 100644 index 12043ae..0000000 --- a/src/main/java/com/ann/demo/entity/interfaceEntity/InspectionApply.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ann.demo.entity.interfaceEntity; - -import lombok.Data; - -import javax.persistence.Entity; -import java.util.Date; - -/** - * 检验申请单 - * - * @Author: LeiJiaXin - * @Date: 2019/12/23 15:42 - */ -@Data -public class InspectionApply { - - private String applyId; - - private Date xmlCreateTime; - - private String inpNo; - - private String visitId; - - private String patientId; - - private Date authorReportTime; - - private String result; - - private Integer isValid = 0; - - /** - * 2019-10-21 新增是否开立接口 E 检查 F 取消检查 - */ - private String isOpen; - - -} diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java b/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java index 1af9fe9..966064d 100644 --- a/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java +++ b/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java @@ -47,7 +47,7 @@ public class MessageLog { /** * 消息结果 0 未成功 1是成功 */ - private Integer result; + private Integer result = 0; /** * 返回json diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/UltrasonicReport.java b/src/main/java/com/ann/demo/entity/interfaceEntity/UltrasonicReport.java deleted file mode 100644 index bdb7cd3..0000000 --- a/src/main/java/com/ann/demo/entity/interfaceEntity/UltrasonicReport.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ann.demo.entity.interfaceEntity; - -import lombok.Data; - -/** - * @Description 超声报告 - * @Date 2019/6/24 21:58 - * @Created by ljx - */ - -@Data -public class UltrasonicReport { - - /* - * 文档流水号 - * */ - private String id; - - /* - * 住院号标识号 - * */ - private String inpNo; - - /* - * 检查报告单号 - * */ - private String checkReportId; - - /** - * 电子申请单号 - */ - private String applyId; - - /** - * 就诊次数 - */ - private String visitId; - - /** - * 患者姓名 - */ - private String name; - - - /*检查报告医师（文档创作者）*/ - - /** - * 检查报告日期 - */ - private String authorReportTime; - - - /** - * 医师标识 - */ - private String assignedAuthorId; - - /** - * 医师姓名 - */ - private String assignedPersonName; - - - /* 审核医师签名 */ - - /** - * 审核医师Id - */ - private String examineId; - - /** - * 审核医师姓名 - */ - private String examineAssignedPersonName; - - /** - * 检查报告地址 - */ - private String reportAddress; - - @Override - public String toString() { - return "UltrasonicReport{" + - "id='" + id + '\'' + - ", inpNo='" + inpNo + '\'' + - ", checkReportId='" + checkReportId + '\'' + - ", applyId='" + applyId + '\'' + - ", visitId='" + visitId + '\'' + - ", name='" + name + '\'' + - ", authorReportTime='" + authorReportTime + '\'' + - ", assignedAuthorId='" + assignedAuthorId + '\'' + - ", assignedPersonName='" + assignedPersonName + '\'' + - ", examineId='" + examineId + '\'' + - ", examineAssignedPersonName='" + examineAssignedPersonName + '\'' + - '}'; - } -} diff --git a/src/main/java/com/ann/demo/entity/normalEntity/CommonTable.java b/src/main/java/com/ann/demo/entity/normalEntity/CommonTable.java index e1785df..e31b6e5 100644 --- a/src/main/java/com/ann/demo/entity/normalEntity/CommonTable.java +++ b/src/main/java/com/ann/demo/entity/normalEntity/CommonTable.java @@ -60,12 +60,6 @@ public class CommonTable { @Column(name = "sex") private String YZY008; - /** - * 8 现住址（省、市、县、街道） - */ - @Column(name = "home_addr") - private String YZY075; - /** * 14 住院次数 */ @@ -116,7 +110,7 @@ public class CommonTable { * 103 主治医师 */ @Column(name = "attending") - private String YZY055; + private String YZY054; /** @@ -128,12 +122,18 @@ public class CommonTable { ///////////////////////////////// + /** + * 户口地址 + */ + @Column(name = "home_addr") + private String AAC010; + /** * 住院号 */ @Id @Column(name = "inpatient_no", length = 30) - private String inpatient_no; + private String YZY175; /** * 姓名简写 @@ -147,4 +147,10 @@ public class CommonTable { @Column(name = "main_dis_thing") private String main_dis_thing; + /** + * 出院主诊断编码 + */ + @Column(name = "main_diag_code") + private String mainDiagCode; + } diff --git a/src/main/java/com/ann/demo/entity/normalEntity/CommonTable1.java b/src/main/java/com/ann/demo/entity/normalEntity/CommonTable1.java index 968d936..5df9639 100644 --- a/src/main/java/com/ann/demo/entity/normalEntity/CommonTable1.java +++ b/src/main/java/com/ann/demo/entity/normalEntity/CommonTable1.java @@ -45,7 +45,13 @@ public class CommonTable1 { * 7 医疗付费方式 */ @Column(name = "pay_type") - private String YZY074; + private String YZY158; + + /** + * 8 现住址（省、市、县、街道） + */ + @Column(name = "addr") + private String YZY075; /** @@ -59,7 +65,7 @@ public class CommonTable1 { * 10 职业 */ @Column(name = "job") - private String YZY016; + private String YZY156; /** * 11 联系人地址 @@ -96,7 +102,7 @@ public class CommonTable1 { * 17 国籍 */ @Column(name = "country") - private String AAC161; + private String YZY013; /** * 18 籍贯 @@ -105,16 +111,14 @@ public class CommonTable1 { private String YZY076; /** - * 23 联系人关系 + * 23 联系人与病人关系 */ @Column(name = "relation") - private String YZY026; - - + private String YZY157; /** * 24 现住址电话 */ - @Column(name = "home_tel") + @Column(name = "telphone") private String YZY079; /** @@ -136,22 +140,22 @@ public class CommonTable1 { private String YZY080; /** - * 64 （主要出院诊断）入院病情 -------------入院病情 1.危，2.急，3.一般 + * 64 出院主诊断入院病情 -------------入院病情 1.危，2.急，3.一般 */ @Column(name = "admiss_thing") private String YZY111; - /** - * 72 门((急)诊诊断编码 - */ - @Column(name = "clinic_diag") - private String YZY113; - - /** - * 73门((急)诊诊断 - */ - @Column(name = "clinic_name") - private String YZY114; +// /** +// * 72 门((急)诊诊断编码 +// */ +// @Column(name = "clinic_diag") +// private String YZY113; +// +// /** +// * 73门((急)诊诊断 +// */ +// @Column(name = "clinic_name") +// private String YZY114; /** @@ -161,17 +165,17 @@ public class CommonTable1 { private String YZY046; /** - * 75 是否死亡患者尸检 0.未做，1.符合，2.不符合，3.不肯定，4.不作统计 + * 75 死亡患者是否尸检 0.未做，1.符合，2.不符合，3.不肯定，4.不作统计 */ @Column(name = "emit_pathology") - private String YZY089; + private String YZY161; /** * 76 血型 */ @Column(name = "blood_type") - private String YZY090; + private String YZY162; /** * 77 是否药物过敏 @@ -184,7 +188,7 @@ public class CommonTable1 { * 84 Rh 1.阴，2.阳，3未查 */ @Column(name = "RH") - private String YZY096; + private String YZY163; /** * 94 入院科别 @@ -221,11 +225,11 @@ public class CommonTable1 { * 101 编码员 */ @Column(name = "coding") - private String YZY061; + private String YZY062; /** - * 102 （出院）病房 + * 102 出院病室 */ @Column(name = "dis_ward") private String YZY039; @@ -237,7 +241,7 @@ public class CommonTable1 { private String YZY056; /** - * 105 科主任 + * 105 科主任姓名 */ @Column(name = "dept_director") private String YZY050; @@ -278,9 +282,10 @@ public class CommonTable1 { /** * 病案质量 1.甲，2.乙，3.丙 + * YZY064 为名称 */ @Column(name = "quality") - private String YZY064; + private String YZY063; /** @@ -288,6 +293,7 @@ public class CommonTable1 { */ @Column(name = "refresher") private String YZY058; + /** * 实习医师 */ @@ -295,4 +301,272 @@ public class CommonTable1 { private String YZY060; + + /** + * 住院总费用 + */ + @Column(name = "total_charge") + private String AKC264; + + /** + * 治疗类-9-临床物理治疗费 + */ + @Column(name = "charge_34") + private String YZY132; + + /** + * 治疗类-10-麻醉费 + */ + @Column(name = "charge_14") + private String YZY134; + + /** + * 治疗类-10-手术费 + */ + @Column(name = "charge_19") + private String YZY135; + + /** + * 西药类-13-抗菌药物费用 + */ + @Column(name = "charge_37") + private String YZY152; + + /** + * 综合医疗服务类-一般医疗服务费(1) + */ + @Column(name = "charge_10") + private String YZY123; + + /** + * 综合医疗服务类-一般治疗操作费(2) + */ + @Column(name = "charge_25") + private String YZY124; + + /** + * 综合医疗服务类-护理费(3) + */ + @Column(name = "charge_02") + private String YZY125; + + /** + * 综合医疗服务类-其他费用(4) + */ + @Column(name = "charge_20") + private String YZY126; + + /** + * 诊断类-病理诊断费(5) + */ + @Column(name = "charge_29") + private String YZY127; + + /** + * 诊断类-实验室诊断费(6) + */ + @Column(name = "charge_30") + private String YZY128; + + /** + * 诊断类-影像学诊断费(7) + */ + @Column(name = "charge_31") + private String YZY129; + + /** + * 诊断类-临床诊断项目费(8) + */ + @Column(name = "charge_32") + private String YZY130; + + /** + * 治疗类-非手术治疗项目费(9) + */ + @Column(name = "charge_33") + private String YZY131; + + /** + * 康复类-康复费(11) + */ + @Column(name = "charge_36") + private String YZY136; + + /** + * 中医类-中医治疗费(12) + */ + @Column(name = "charge_38") + private String YZY137; + + /** + * 西药类-西药费(13) + */ + @Column(name = "charge_03") + private String YZY138; + + /** + * 中药类-中成药费(14) + */ + @Column(name = "charge_04") + private String YZY153; + + /** + * 中药类-中草药费(15) + */ + @Column(name = "charge_05") + private String YZY154; + + /** + * 血液和血液制品类-血费(16) + */ + @Column(name = "charge_09") + private String YZY139; + + /** + * 血液和血液制品类-白蛋白类制品费(17) + */ + @Column(name = "charge_39") + private String YZY140; + + /** + * 血液和血液制品类-球蛋白类制品费(18) + */ + @Column(name = "charge_40") + private String YZY141; + + /** + * 血液和血液制品类-凝血因子类制品费(19) + */ + @Column(name = "charge_41") + private String YZY142; + + /** + * 血液和血液制品类-细胞因子类制品费(20) + */ + @Column(name = "charge_42") + private String YZY143; + + /** + * 耗材类-检查用一次性医用材料费(21) + */ + @Column(name = "charge_43") + private String YZY144; + + /** + * 耗材类-治疗用一次性医用材料费(22) + */ + @Column(name = "charge_44") + private String YZY145; + + /** + * 耗材类-手术用一次性医用材料费(23) + */ + @Column(name = "charge_45") + private String YZY146; + + /** + * 其他类-其他费(24) + */ + @Column(name = "other") + private String YZY155; + + /** + * 自付费用 + */ + @Column(name = "charge_22") + private String YZY122; + + /** + * （入院前）颅脑损伤时间 + */ + @Column(name = "craniocerebral_starttime") + private String YZY081; + + /** + * （入院后）颅脑损伤时间 + */ + @Column(name = "craniocerebral_endtime") + private String YZY082; + + /** + * 离院方式 + */ + @Column(name = "dis_type") + private String YZY171; + + /** + * 是否有31天内再次入院计划 + */ + @Column(name = "is_hospitalization") + private String YZY164; + + /** + * 31天内再次入院目的 + */ + @Column(name = "hospitalization_objective") + private String YZY099; + + /** + * 责任护士 + */ + @Column(name = "responsible_nurse") + private String YZY103; + + // 2020-8-31 新增以下节点 + /** + * 是否临床路径病例 + */ + @Column(name = "is_medical_record_path") + private String YZY165; + + /** + * 肿瘤放疗方式 + */ + @Column(name = "radiotherapy_type") + private String YZY166; + + /** + * 肿瘤放疗装置 + */ + @Column(name = "radiotherapy_device") + private String YZY167; + + /** + * 化疗方式 + */ + @Column(name = "chemotherapy_type") + private String YZY168; + + /** + * 化疗方法 + */ + @Column(name = "chemotherapy_method") + private String YZY169; + + /** + * 病例分型 + */ + @Column(name = "case_type") + private String YZY170; + + + /** + * 转科1科室 + */ + @Column(name = "change_dept1") + private String YZY172; + + /** + * 转科2科室 + */ + @Column(name = "change_dept2") + private String YZY173; + + /** + * 转科3科室 + */ + @Column(name = "change_dept3") + private String YZY174; + + } diff --git a/src/main/java/com/ann/demo/entity/normalEntity/DiagDetail.java b/src/main/java/com/ann/demo/entity/normalEntity/DiagDetail.java index 6bbc9d0..0f5a6b0 100644 --- a/src/main/java/com/ann/demo/entity/normalEntity/DiagDetail.java +++ b/src/main/java/com/ann/demo/entity/normalEntity/DiagDetail.java @@ -4,7 +4,6 @@ import com.ann.demo.entity.normalEntity.ids.DiagDetailIds; import lombok.Data; import javax.persistence.*; -import java.io.Serializable; import java.util.Date; /** @@ -25,7 +24,7 @@ public class DiagDetail { private String masterId; /** - * 诊断ICD + * 诊断ID ICD码 * */ @Id @Column(name = "diag_code", length = 50) @@ -47,7 +46,7 @@ public class DiagDetail { private Integer YZY201; /** - * 诊断病名 + * 诊断名称 * */ @Column(name = "diag_name") private String AKC185; diff --git a/src/main/java/com/ann/demo/entity/normalEntity/OperDetail.java b/src/main/java/com/ann/demo/entity/normalEntity/OperDetail.java index 1b984dd..1420b21 100644 --- a/src/main/java/com/ann/demo/entity/normalEntity/OperDetail.java +++ b/src/main/java/com/ann/demo/entity/normalEntity/OperDetail.java @@ -4,7 +4,6 @@ import com.ann.demo.entity.normalEntity.ids.OperDetailIds; import lombok.Data; import javax.persistence.*; -import java.io.Serializable; import java.util.Date; /** @@ -25,26 +24,26 @@ public class OperDetail { private String masterId; /** - * + * 诊断序号 */ @Column(name = "operate_no") private Integer YZY201; /** - * 手术操作编码 + * 手术码 */ @Id @Column(name = "operateCode") private String YZY207; /** - * 手术操作名称 + * 手术名称 */ @Column(name = "operateName") private String YZY208; /** - * 手术操作日期 + * 手术日期 */ @Column(name = "operateDate") private Date YZY209; @@ -56,7 +55,7 @@ public class OperDetail { private String YZY227; /** - * 手术操作术者 + * 手术医生 */ @Column(name = "operator") private String YZY215; @@ -80,7 +79,7 @@ public class OperDetail { private String assistant_3; /** - * 切口愈合等级 + * 切口编号 */ @Column(name = "cut") private String YZY210; @@ -89,13 +88,13 @@ public class OperDetail { * 麻醉方式 */ @Column(name = "anaesthesia_type") - private String YZY216; + private String YZY217; /** * 麻醉医师 */ @Column(name = "anaesthesia_name") - private String YZY223; + private String YZY224; /** * 录入员编号 @@ -123,10 +122,10 @@ public class OperDetail { private String OPERATION_SCALE; /** - * + * 是否周期性手术 */ @Column(name = "chossurg") - private String ChosSurg; + private String YZY229; /** * diff --git a/src/main/java/com/ann/demo/entity/normalEntity/OtherData.java b/src/main/java/com/ann/demo/entity/normalEntity/OtherData.java index 46ae429..4f669bf 100644 --- a/src/main/java/com/ann/demo/entity/normalEntity/OtherData.java +++ b/src/main/java/com/ann/demo/entity/normalEntity/OtherData.java @@ -23,94 +23,11 @@ public class OtherData { */ private String YZY078; - - /** - * 21 户口地址 - */ - private String AAC010; - /** * 22 户口地址邮编 */ private String YZY024; - /** - * 28 住院总费用 - */ - private String AKC264; - - /** - * 29 治疗类-9-临床物理治疗费 - */ - @Column(name = "lcwlzlf") - private String YZY132; - - /** - * 30 治疗类-10-麻醉费 - */ - @Column(name = "mzf") - private String YZY134; - - - /** - * 31 治疗类-10-手术费 - */ - @Column(name = "ssf") - private String YZY135; - - /** - * 32 西药类-13-抗菌药物费用 - */ - @Column(name = "kjywfy") - private String YZY152; - - /** - * 33 综合医疗服务类-一般医疗服务费(1) - */ - @Column(name = "ybylfwf1") - private String YZY123; - - /** - * 34 综合医疗服务类-一般治疗操作费(2) - */ - @Column(name = "ybylfwf2") - private String YZY124; - - /** - * 35 综合医疗服务类-护理费(3) - */ - @Column(name = "hlf") - private String YZY125; - - /** - * 36 综合医疗服务类-其他费用(4) - */ - @Column(name = "qtfy") - private String YZY126; - - /** - * 37 诊断类-病理诊断费(5) - */ - @Column(name = "blzdf") - private String YZY127; - - /** - * 38 诊断类-实验室诊断费(6) - */ - @Column(name = "syszdf") - private String YZY128; - - /** - * 39 诊断类-影像学诊断费(7) - */ - @Column(name = "yxxzdf") - private String YZY129; - - /** - * 40 诊断类-临床诊断项目费(8) - */ - @Column(name = "lczdxmf") - private String YZY130; // /** // * 41 治疗类-非手术治疗项目费(9)-2 @@ -119,12 +36,6 @@ public class OtherData { // private String YZY132; - /** - * 42 治疗类-非手术治疗项目费(9) - */ - @Column(name = "fsszlxmf") - private String YZY131; - /** * 43 治疗类-手术治疗费(10) */ @@ -132,146 +43,58 @@ public class OtherData { private String YZY133; /** - * 44 康复类-康复费(11) - */ - @Column(name = "kff") - private String YZY136; - - /** - * 45 中医类-中医治疗费(12) + * 61 主要手术名称 */ - @Column(name = "zyzlf") - private String YZY137; - - - /** - * 46 西药类-西药费(13) - */ - @Column(name = "xyf") - private String YZY138; - - /** - * 47 中药类-中成药费(14) - */ - @Column(name = "zcyf") - private String YZY153; - - /** - * 48 中药类-中草药费(15) - */ - @Column(name = "zcyf") - private String YZY154; - - /** - * 49 血液和血液制品类-血费(16) - */ - @Column(name = "xf") - private String YZY139; - - /** - * 50 血液和血液制品类-白蛋白类制品费(17) - */ - @Column(name = "bdblzpf") - private String YZY140; - - /** - * 51 血液和血液制品类-球蛋白类制品费(18) - */ - @Column(name = "qdblzpf") - private String YZY141; - - /** - * 52 血液和血液制品类-凝血因子类制品费(19) - */ - @Column(name = "nxyzlzpf") - private String YZY142; - - /** - * 53 血液和血液制品类-细胞因子类制品费(20) - */ - @Column(name = "xbyzlzpf") - private String YZY143; - - /** - * 54 耗材类-检查用一次性医用材料费(21) - */ - @Column(name = "jcyycxyyclf") - private String YZY144; - - /** - * 55 耗材类-治疗用一次性医用材料费(22) - */ - @Column(name = "zlyycxyyclf") - private String YZY145; + @Column(name = "operate_name") + private String YZY105; /** - * 56 耗材类-手术用一次性医用材料费(23) + * （主要手术）切口愈合等级 */ - @Column(name = "ssyycxyyclf") - private String YZY146; + @Column(name = "cut") + private String YZY084; /** - * 57 其他类-其他费(24) + * 主要手术日期 */ - @Column(name = "qtf") - private String YZY155; + @Column(name = "operate_date") + private String YZY106; /** - * 58 自付费用 + * 主要手术级别 */ - @Column(name = "zffy") - private String YZY122; + @Column(name = "operate_class") + private String YZY108; /** - * 59 （主要出院诊断）编码 + * 主要手术术者 */ - private String mainDiagCode; - - + @Column(name = "operator") + private String YZY109; /** - * 61 （主要手术）名称 + * （主要手术）麻醉医师 */ - private String YZY105; + @Column(name = "anaesthesia_name") + private String YZY112; /** - * 62 （主要操作）名称 + * 62 主要操作名称 */ private String YZY110; /** * 63 （其他出院诊断）编码-1-2 - * 等待确认 - */ - - - /** - * 65 （入院前）颅脑损伤时间 - */ - private String YZY081; - - /** - * 66 （入院后）颅脑损伤时间 */ - private String YZY082; + private String YZY221; /** * 67 （主要操作）切口愈合等级 */ private String YZY083; - /** - * 68 （主要手术）切口愈合等级 - */ - private String YZY084; - - /** - * 69 （主要手术）日期 - */ - private String YZY106; - /** * 70 （主要操作）日期 */ @@ -288,14 +111,14 @@ public class OtherData { private String pathologyDingName; /** - * 71 （主要手术）麻醉方式 + * 71 主要手术麻醉方式 */ private String YZY107; /** * 78 损伤、中毒的外部原因疾病编码必填 */ - private String mainDiagCodeOutSideReason; + private String YZY091; /** * 79 损伤中毒的外部原因编码 @@ -312,56 +135,16 @@ public class OtherData { */ private String YZY094; - /** - * 82 （主要手术）级别 - */ - private String YZY108; /** * 83 病理号 (基于其他病理诊断内容判断病理号不为空 ) */ private String YZY095; - /** - * 85 （主要手术）术者 - */ - private String YZY109; - /** * 86 （主要操作）术者 */ private String YZY097; - - /** - * 87 离院方式 - */ - private String YZY070; - - - /** - * 91 是否有31天内再次入院计划 - */ - private String YZY098; - - - /** - * 92 31天内再次入院目的 - */ - private String YZY099; - - /** - * 98 （主要手术）麻醉医师 - */ - private String YZY112; - - - /** - * 100 责任护士 - */ - private String YZY103; - - - } diff --git a/src/main/java/com/ann/demo/entity/normalEntity/User.java b/src/main/java/com/ann/demo/entity/normalEntity/User.java deleted file mode 100644 index 072fe43..0000000 --- a/src/main/java/com/ann/demo/entity/normalEntity/User.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.ann.demo.entity.normalEntity; - - -import lombok.Data; - -import javax.persistence.*; -import java.util.Date; - -/** - * @Description 用户 - * @Date 2019/6/15 16:57 - * @Created by ljx - */ - -@Table(name = "powerUser") -@Entity -@Data -public class User { - - /** - * 用户标识 - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "userId") - private Integer id; - - @Column(name = "remark") - private String USER_ID; - - /** - * 用户姓名 - */ - @Column(name = "userName") - private String USER_NAME; - - /** - * 用户科室 - */ - @Column(name = "deptId") - private String USER_DEPT; - - /** - * 用户密码 - */ - @Column(name = "userPwd") - private String USER_PWD; - - /** - * 建立日期 - */ - @Column(name = "createDate") - private String CREATE_DATE; - - /** - * 用户类型 用户角色 0 为医生,1 为护士； - */ - @Column(name = "roleId") - private Integer USER_TYPE; - - - @Column(name = "effective") - private Integer isValid = 0; - - /** - * 1 有资质 0 无资质； - */ - private Integer EDUCATION_FLAG; - -} diff --git a/src/main/java/com/ann/demo/entity/normalEntity/User3.java b/src/main/java/com/ann/demo/entity/normalEntity/User3.java deleted file mode 100644 index 89277ce..0000000 --- a/src/main/java/com/ann/demo/entity/normalEntity/User3.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.ann.demo.entity.normalEntity; - - -import lombok.Data; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.util.Date; - -/** - * @Description 用户 - * @Date 2019/6/15 16:57 - * @Created by ljx - */ - -@Table(name = "users") -@Entity -@Data -public class User3 { - - /** - * 用户标识 - */ - @Id - @Column(name = "id") - private String USER_ID; - - /** - * 用户姓名 - */ - @Column(name = "name") - private String USER_NAME; - - /** - * 用户科室 - */ - @Column(name = "departmentid") - private String USER_DEPT; - - /** - * 用户密码 - */ - @Column(name = "password") - private String USER_PWD; - - /** - * 建立日期 - */ - @Column(name = "createdate") - private Date CREATE_DATE; - - /** - * 拼音码 - */ - @Column(name = "initialism") - private String PYM; - - /** - * 登陆名 - */ - @Column(name = "code") - private String USER_LOGIN_NAME; - - /** - * 用户类型 用户角色 0 为医生,1 为护士； - */ - @Column(name = "roleid") - private String USER_TYPE; - - - @Column(name = "isvalid") - private Integer isValid = 0; - - /** - * 1 有资质 0 无资质； - */ - @Column(name = "EDUCATION_FLAG") - private Integer EDUCATION_FLAG; - -} diff --git a/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java b/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java index 078ab71..30bea0c 100644 --- a/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java +++ b/src/main/java/com/ann/demo/interfaces/HomepageDictionary.java @@ -7,11 +7,6 @@ import javax.jws.WebService; @WebService public interface HomepageDictionary { -// @WebMethod -// String ReceiveDict(@WebParam(name = "InputPara") String InputPara); - - @WebMethod - String HIPMessageServer(@WebParam(name = "action") String action, @WebParam(name = "message") String message); @WebMethod String InpSummary(@WebParam(name = "InputPara") String InputPara); diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java index 7b8ec56..fe11fe5 100644 --- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java +++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java @@ -45,9 +45,6 @@ public class HomepageDictionaryImpl implements HomepageDictionary { @Autowired private MessageSubordinateService messageSubordinateService; - @Autowired - private AnalysisService analysisService; - @Autowired private ArchiveDetailService archiveDetailService; @@ -55,45 +52,6 @@ public class HomepageDictionaryImpl implements HomepageDictionary { private ArchiveMasterService archiveMasterService; - @Autowired - ExamApplyService examApplyService; - - @Override - public String HIPMessageServer(String action, String message) { -// String result = ""; -// try { -// if (action != null && message != null && !(message.equals("") && action.equals(""))) { -// switch (action) { -// case InterfaceName.PARAMETER_ADMISSION: -// // 入院 -// result = analysisService.getHIPMessageServerResult(message, ArchiveMaster.class, InterfaceName.PARAMETER_ADMISSION); -// break; -// case InterfaceName.PARAMETER_DISCHARGE: -// // 出院 -// result = analysisService.getHIPMessageServerResult(message, ArchiveMaster.class, InterfaceName.PARAMETER_DISCHARGE); -// break; -// case InterfaceName.PARAMETER_TRANSFER: -// // 转科 -// result = analysisService.getHIPMessageServerResult(message, ArchiveMaster.class, InterfaceName.PARAMETER_TRANSFER); -// break; -// case InterfaceName.PARAMETER_CANCELLATION_DISCHARGE: -// // 取消入院 -// result = analysisService.getHIPMessageServerResult(message, ArchiveMaster.class, InterfaceName.PARAMETER_CANCELLATION_DISCHARGE); -// break; -// case InterfaceName.PARAMETER_PATIENT_UPDATE: -// // 患者信息更新 -// result = analysisService.getHIPMessageServerResult(message, ArchiveMaster.class, InterfaceName.PARAMETER_PATIENT_UPDATE); -// break; -// } -// } -// }catch (Exception e){ -// return ""; -// } - // ---------------------------------------这里捕捉 参数为空 -// return result; - return null; - } - @Override public String InpSummary(String xmlStr) { String outContent = "失败"; @@ -103,7 +61,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary { // 1、定义变量 long startTime = System.currentTimeMillis(); boolean flag = false; - Integer result = 0; + Integer result = 2; Date xmlCreateTime = null; MessageLog messageLog = new MessageLog(xmlStr, InterfaceName.INP_SUMMARY, new Date(),WebserviceId.INP_SUMMARY); MedicalRecordHomepageCache medicalRecordHomepageCache = null; @@ -150,10 +108,10 @@ public class HomepageDictionaryImpl implements HomepageDictionary { logger.info("-----------------------病案首页总用时长:" + (endTime - startTime) + "-------------------------"); }catch (Exception e){ try { - outContent = AnalysisService.getReturnResult(false,remark); - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,e,e.getStackTrace()[0]); + outContent = AnalysisService.getReturnResult(false,e.getMessage()); + logger.error("当前参数：{},报错信息：{}","InpSummary",e.getMessage()); } catch (Exception ex) { - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,ex,ex.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","InpSummary",ex.getMessage()); } } return outContent; @@ -167,7 +125,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary { // 手麻系统 判断消息是否传过 存入消息 然后解析消息 然后存到附属表 // 1、定义变量 boolean flag = false; - Integer result = 0; + Integer result = 2; String type = "", patientMainStr = null,archiveMasterId = null; long startTime = System.currentTimeMillis(); Date xmlCreateTime = null; @@ -207,9 +165,9 @@ public class HomepageDictionaryImpl implements HomepageDictionary { }catch (Exception e){ try { outContent = AnalysisService.getReturnResult(false,remark); - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,e,e.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","handNumbnessReport",e.getMessage()); } catch (Exception ex) { - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,ex,ex.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","handNumbnessReport",ex.getMessage()); } } return outContent; @@ -280,9 +238,9 @@ public class HomepageDictionaryImpl implements HomepageDictionary { }catch (Exception e){ try { outContent = AnalysisService.getReturnResult(false,remark); - logger.error("出错咯！消息id为{}，错误信息为{}，以及错误行数为:{}" ,messageLog.getId(),e,e.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","ICUReport",e.getMessage()); } catch (Exception ex) { - logger.error("出错咯！消息id为{}，错误信息为{}，以及错误行数为:{}" ,messageLog.getId(),e,e.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","ICUReport",ex.getMessage()); } } return outContent; @@ -340,10 +298,10 @@ public class HomepageDictionaryImpl implements HomepageDictionary { } }catch (Exception e){ try { - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,e,e.getStackTrace()[0]); + logger.error("当前参数：{},报错信息：{}","BloodTransfusionUrl",e.getMessage()); return AnalysisService.getReturnResult(false,remark); - } catch (Exception e1) { - logger.error("出错咯！错误信息为{}，以及错误行数为:{}" ,e1,e1.getStackTrace()[0]); + } catch (Exception ex) { + logger.error("当前参数：{},报错信息：{}","BloodTransfusionUrl",ex.getMessage()); } } return outContent; diff --git a/src/main/java/com/ann/demo/repository/DepartmentRepository.java b/src/main/java/com/ann/demo/repository/DepartmentRepository.java deleted file mode 100644 index 6c4ac1d..0000000 --- a/src/main/java/com/ann/demo/repository/DepartmentRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ann.demo.repository; - -import com.ann.demo.entity.normalEntity.Department; -import com.ann.demo.entity.normalEntity.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -/** - * @Author: LeiJiaXin - * @Date: 2019/7/16 9:53 - */ -@Repository -public interface DepartmentRepository extends JpaRepository { - - @Query("select o from Department o where o.DEPT_CODE = ?1 and o.isValid = ?2 ") - public Department findDepartmentByDeptCodeAndIsValid(String deptCode, Integer isValid); -} diff --git a/src/main/java/com/ann/demo/repository/EMRDictionaryRepository.java b/src/main/java/com/ann/demo/repository/EMRDictionaryRepository.java deleted file mode 100644 index 3aee3c1..0000000 --- a/src/main/java/com/ann/demo/repository/EMRDictionaryRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ann.demo.repository; - -import com.ann.demo.entity.normalEntity.Department; -import com.ann.demo.entity.normalEntity.EMRDictionary; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -/** - * @Author: LeiJiaXin - * @Date: 2019/9/21 16:04 - */ -@Repository -public interface EMRDictionaryRepository extends JpaRepository { - - @Query("select o from EMRDictionary o where o.DEPT_CODE = ?1 and o.isValid = ?2 ") - public EMRDictionary findEMRDictionaryByCodeAndIsValid(String code, Integer isValid); -} diff --git a/src/main/java/com/ann/demo/repository/ExamApplyRepository.java b/src/main/java/com/ann/demo/repository/ExamApplyRepository.java deleted file mode 100644 index 7f7f681..0000000 --- a/src/main/java/com/ann/demo/repository/ExamApplyRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ann.demo.repository; - -import com.ann.demo.entity.interfaceEntity.ExamApply; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -/** - * @Author: LeiJiaXin - * @Date: 2019/8/22 16:22 - */ -@Repository -public interface ExamApplyRepository extends JpaRepository { - - @Transactional - @Modifying - @Query("update ExamApply o set o.isValid = 1 where o.applyId = ?1 and o.isValid = 0 ") - public Integer updateExamApplyIsValidById(String applyId); - - @Query("select count(o) from ExamApply o where o.applyId = ?1 and o.isValid = 0") - public Integer countExamApply(String applyId); - - public ExamApply findByApplyId(String applyId); -} diff --git a/src/main/java/com/ann/demo/repository/UserRepository.java b/src/main/java/com/ann/demo/repository/UserRepository.java deleted file mode 100644 index 3cc054d..0000000 --- a/src/main/java/com/ann/demo/repository/UserRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ann.demo.repository; - -import com.ann.demo.entity.normalEntity.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @Author: LeiJiaXin - * @Date: 2019/7/16 9:53 - */ -@Repository -public interface UserRepository extends JpaRepository { - - -} diff --git a/src/main/java/com/ann/demo/service/AnalysisService.java b/src/main/java/com/ann/demo/service/AnalysisService.java index 1c2dcaf..46f80ad 100644 --- a/src/main/java/com/ann/demo/service/AnalysisService.java +++ b/src/main/java/com/ann/demo/service/AnalysisService.java @@ -1,26 +1,9 @@ package com.ann.demo.service; -import com.alibaba.fastjson.JSON; -import com.ann.demo.entity.constant.AliasName; -import com.ann.demo.entity.constant.InterfaceName; -import com.ann.demo.entity.filing.dto.MessageDto; -import com.ann.demo.entity.interfaceEntity.ArchiveMaster; -import com.ann.demo.entity.interfaceEntity.ExamApply; -import com.ann.demo.entity.interfaceEntity.InspectionApply; -import com.ann.demo.entity.interfaceEntity.MessageLog; -import com.ann.demo.entity.normalEntity.MedicalRecordHomepage; -import com.ann.demo.entity.normalEntity.MedicalRecordHomepageCache; import com.ann.demo.entity.normalEntity.OutPara; import com.ann.demo.utils.XMLUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Date; -import java.util.List; -import java.util.Objects; - /** * 解析逻辑 * @@ -30,32 +13,14 @@ import java.util.Objects; @Component public class AnalysisService { - static final Logger logger = LoggerFactory.getLogger(AnalysisService.class); - - @Autowired - MessageService messageService; - - @Autowired - MessageSubordinateService messageSubordinateService; - - @Autowired - ArchiveMasterService archiveMasterService; - - @Autowired - ExamApplyService examApplyService; - - @Autowired - MedicalRecordHomepageCacheService medicalRecordHomepageCacheService; - - public static String getReturnResult(boolean resultCode,String remark) throws Exception{ OutPara outPara = new OutPara(); - if (!resultCode) { - outPara.setRESULT_CODE(false); - outPara.setRESULT_CONTENT(remark); - } else { + if (resultCode) { outPara.setRESULT_CODE(true); outPara.setRESULT_CONTENT("成功"); + } else { + outPara.setRESULT_CODE(false); + outPara.setRESULT_CONTENT(remark); } return XMLUtils.generateXmlStr(outPara); } diff --git a/src/main/java/com/ann/demo/service/DepartmentService.java b/src/main/java/com/ann/demo/service/DepartmentService.java deleted file mode 100644 index 3d370dc..0000000 --- a/src/main/java/com/ann/demo/service/DepartmentService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ann.demo.service; - -import com.ann.demo.entity.normalEntity.Department; -import com.ann.demo.entity.normalEntity.User; - -/** - * @Description - * @Date 2019/7/16 9:56 - * @Created by ljx - */ - -public interface DepartmentService { - - public void save(Department department); - - public void delete(Department department); - - public Department findDepartment(String user_dept); -} diff --git a/src/main/java/com/ann/demo/service/EMRDictionaryService.java b/src/main/java/com/ann/demo/service/EMRDictionaryService.java deleted file mode 100644 index 543a398..0000000 --- a/src/main/java/com/ann/demo/service/EMRDictionaryService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ann.demo.service; - -import com.ann.demo.entity.normalEntity.EMRDictionary; - -/** - * @Author: LeiJiaXin - * @Date: 2019/9/21 16:08 - */ -public interface EMRDictionaryService { - - public void save(EMRDictionary emrDictionary); - - public void delete(EMRDictionary emrDictionary); - - public EMRDictionary findEMRDictionary(String code); -} diff --git a/src/main/java/com/ann/demo/service/ExamApplyService.java b/src/main/java/com/ann/demo/service/ExamApplyService.java deleted file mode 100644 index bab0f46..0000000 --- a/src/main/java/com/ann/demo/service/ExamApplyService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ann.demo.service; - -import com.ann.demo.entity.interfaceEntity.ExamApply; - -/** - * @Author: LeiJiaXin - * @Date: 2019/8/22 16:20 - */ -public interface ExamApplyService { - - public void save(ExamApply examApply); - - /* public boolean updateExamApplyIsValidById(String id);*/ - - //public String findId(String applyId,String inpNo,String visitId,String patientId); - - public ExamApply findExamApply(String applyId); - - Integer countExamApply(String applyId); - - boolean updateExamApplyIsValid(String applyId); -} diff --git a/src/main/java/com/ann/demo/service/UserService.java b/src/main/java/com/ann/demo/service/UserService.java deleted file mode 100644 index 2878c4c..0000000 --- a/src/main/java/com/ann/demo/service/UserService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ann.demo.service; - -import com.ann.demo.entity.normalEntity.User; - -/** - * @Description - * @Date 2019/7/16 9:56 - * @Created by ljx - */ - -public interface UserService { - - public void save(User user); - - public void delete(User user); - -} diff --git a/src/main/java/com/ann/demo/service/impl/DepartmentServiceImpl.java b/src/main/java/com/ann/demo/service/impl/DepartmentServiceImpl.java deleted file mode 100644 index 7df0e18..0000000 --- a/src/main/java/com/ann/demo/service/impl/DepartmentServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ann.demo.service.impl; - -import com.ann.demo.entity.normalEntity.Department; -import com.ann.demo.entity.normalEntity.User; -import com.ann.demo.repository.DepartmentRepository; -import com.ann.demo.repository.UserRepository; -import com.ann.demo.service.DepartmentService; -import com.ann.demo.service.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Description - * @Date 2019/7/9 16:43 - * @Created by ljx - */ -@Service -public class DepartmentServiceImpl implements DepartmentService { - - static final Logger logger = LoggerFactory.getLogger(DepartmentServiceImpl.class); - - @Autowired - DepartmentRepository departmentRepository; - - @Override - public void save(Department department) { - //打日志信息 - try { - departmentRepository.save(department); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } - - @Override - public void delete(Department department) { - //打日志信息 - try { - departmentRepository.delete(department); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } - - @Override - public Department findDepartment(String user_dept) { - // ------------------确认 isValid 0是正常 1是停用 - return departmentRepository.findDepartmentByDeptCodeAndIsValid(user_dept, 0); - } -} diff --git a/src/main/java/com/ann/demo/service/impl/EMRDictionaryServiceImpl.java b/src/main/java/com/ann/demo/service/impl/EMRDictionaryServiceImpl.java deleted file mode 100644 index 4c4017d..0000000 --- a/src/main/java/com/ann/demo/service/impl/EMRDictionaryServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ann.demo.service.impl; - -import com.ann.demo.entity.normalEntity.EMRDictionary; -import com.ann.demo.repository.DepartmentRepository; -import com.ann.demo.repository.EMRDictionaryRepository; -import com.ann.demo.service.EMRDictionaryService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Author: LeiJiaXin - * @Date: 2019/9/21 16:08 - */ -@Service -public class EMRDictionaryServiceImpl implements EMRDictionaryService { - - static final Logger logger = LoggerFactory.getLogger(EMRDictionaryServiceImpl.class); - - @Autowired - EMRDictionaryRepository emrDictionaryRepository; - - @Override - public void save(EMRDictionary emrDictionary) { - //打日志信息 - try { - emrDictionaryRepository.save(emrDictionary); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } - - @Override - public void delete(EMRDictionary emrDictionary) { - //打日志信息 - try { - emrDictionaryRepository.delete(emrDictionary); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } - - @Override - public EMRDictionary findEMRDictionary(String code) { - // ------------------确认 isValid 0是正常 1是停用 - return emrDictionaryRepository.findEMRDictionaryByCodeAndIsValid(code, 0); - } -} diff --git a/src/main/java/com/ann/demo/service/impl/ExamApplyServiceImpl.java b/src/main/java/com/ann/demo/service/impl/ExamApplyServiceImpl.java deleted file mode 100644 index 53c772d..0000000 --- a/src/main/java/com/ann/demo/service/impl/ExamApplyServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.ann.demo.service.impl; - -import com.ann.demo.entity.interfaceEntity.ExamApply; -import com.ann.demo.repository.ExamApplyRepository; -import com.ann.demo.service.ExamApplyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Author: LeiJiaXin - * @Date: 2019/8/22 16:20 - */ -@Service -public class ExamApplyServiceImpl implements ExamApplyService { - - @Autowired - ExamApplyRepository examApplyRepository; - - @Override - public void save(ExamApply examApply) { - examApplyRepository.save(examApply); - } - - @Override - public ExamApply findExamApply(String applyId) { - return examApplyRepository.findByApplyId(applyId); - } - - @Override - public Integer countExamApply(String applyId) { - return examApplyRepository.countExamApply(applyId); - } - - @Override - public boolean updateExamApplyIsValid(String applyId) { - if (examApplyRepository.updateExamApplyIsValidById(applyId) > 0) - return true; - return false; - } -} diff --git a/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java index b820e8a..e5e3e92 100644 --- a/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java +++ b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageCacheServiceImpl.java @@ -81,8 +81,6 @@ public class MedicalRecordHomepageCacheServiceImpl implements MedicalRecordHomep if (commonTable1 != null) { // 处理公共表 commonTable.setMasterId(masterId); - // 将 患者id 赋值给 病案号 - commonTable.setInpatient_no(commonTable.getYZY001()); if (operDetails != null) { if (operDetails.size() > 0) { commonTable.setIsOper("有"); @@ -127,7 +125,7 @@ public class MedicalRecordHomepageCacheServiceImpl implements MedicalRecordHomep diagDetail.setMasterId(masterId); // 20200528 取出院诊断的主要诊断 if(Objects.equals(diagDetail.getYZY203(),"3") && Objects.equals(diagDetail.getYZY201(),1) ){ - medicalRecordHomepage.getOtherData().setMainDiagCode(diagDetail.getAKC196()); + commonTable.setMainDiagCode(diagDetail.getAKC196()); commonTable.setMainDiagName(diagDetail.getAKC185()); } } diff --git a/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageServiceImpl.java b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageServiceImpl.java index b159f99..342a367 100644 --- a/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageServiceImpl.java +++ b/src/main/java/com/ann/demo/service/impl/MedicalRecordHomepageServiceImpl.java @@ -62,7 +62,7 @@ public class MedicalRecordHomepageServiceImpl implements MedicalRecordHomepageSe commonTable1Repository.save(medicalRecordHomepage.getCommonTable1()); return true; } catch (Exception e) { - logger.error("保存病案首页出错咯！错误信息:" + e); + logger.error("保存病案首页出错咯！错误信息:" + e.getMessage()); return false; } } diff --git a/src/main/java/com/ann/demo/service/impl/UserServiceImpl.java b/src/main/java/com/ann/demo/service/impl/UserServiceImpl.java deleted file mode 100644 index c919ad4..0000000 --- a/src/main/java/com/ann/demo/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ann.demo.service.impl; - -import com.ann.demo.entity.filing.MessageSubordinate; -import com.ann.demo.entity.normalEntity.Department; -import com.ann.demo.entity.normalEntity.EMRDictionary; -import com.ann.demo.entity.normalEntity.User; -import com.ann.demo.repository.MessageSubordinateRepository; -import com.ann.demo.repository.UserRepository; -import com.ann.demo.service.DepartmentService; -import com.ann.demo.service.MessageSubordinateService; -import com.ann.demo.service.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @Description - * @Date 2019/7/9 16:43 - * @Created by ljx - */ -@Service -public class UserServiceImpl implements UserService { - - static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class); - - @Autowired - UserRepository userRepository; - - @Autowired - EMRDictionaryServiceImpl emrDictionaryService; - - @Override - public void save(User user) { - //打日志信息 - try { - // 获取科室 根据科室类型区分临床和非临床，临床的然后有资质的就是医生，没有资质的就是护士 - Integer roleId = 0; - if (user.getUSER_DEPT() != null) { - EMRDictionary emrDictionary = emrDictionaryService.findEMRDictionary(user.getUSER_DEPT()); - if (emrDictionary != null) { - if (emrDictionary.getCLINIC_ATTR() == 0) { - if (user.getEDUCATION_FLAG() == 0) { // 无资质 护士 - roleId = 1; - } else { // 有资质 为 1 医生 - roleId = 2; - } - } - } - } - user.setUSER_TYPE(roleId); - userRepository.save(user); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } - - @Override - public void delete(User user) { - //打日志信息 - try { - userRepository.delete(user); - } catch (Exception e) { - logger.error("出错咯！错误信息:" + e); - } - } -} diff --git a/src/main/java/com/ann/demo/utils/PinYinUtils.java b/src/main/java/com/ann/demo/utils/PinYinUtils.java index 7f43ec0..37fd9fc 100644 --- a/src/main/java/com/ann/demo/utils/PinYinUtils.java +++ b/src/main/java/com/ann/demo/utils/PinYinUtils.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import java.io.*; -import java.time.LocalDateTime; import java.util.Iterator; import java.util.Properties; import java.util.Set; @@ -98,6 +97,5 @@ public class PinYinUtils { } public static void main(String[] args) { - System.out.println(LocalDateTime.now()); } } diff --git a/src/main/java/com/ann/demo/utils/XMLUtils.java b/src/main/java/com/ann/demo/utils/XMLUtils.java index 9caceac..247ac7a 100644 --- a/src/main/java/com/ann/demo/utils/XMLUtils.java +++ b/src/main/java/com/ann/demo/utils/XMLUtils.java @@ -50,26 +50,6 @@ public class XMLUtils { @Value("${file.path}") private String pathTemp; - // 转科 - public static String transferRecordPath; - @Value("${file.transferRecordPath}") - private String transferRecordPathTemp; - - // 出院 - public static String dischargeRecordPath; - @Value("${file.dischargeRecordPath}") - private String dischargeRecordPathTemp; - - // 入院 - public static String admissionRecordPath; - @Value("${file.admissionRecordPath}") - private String admissionRecordPathTemp; - - // 患者更新 - public static String patientUpdatePath; - @Value("${file.patientUpdatePath}") - private String patientUpdatePathTemp; - // 手麻系统 public static String handNumbnessReportPath; @Value("${file.handNumbnessReportPath}") @@ -88,10 +68,6 @@ public class XMLUtils { @PostConstruct public void init() { path = pathTemp; - patientUpdatePath = patientUpdatePathTemp; - dischargeRecordPath = dischargeRecordPathTemp; - admissionRecordPath = admissionRecordPathTemp; - transferRecordPath = transferRecordPathTemp; handNumbnessReportPath = handNumbnessReportPathTemp; ICUReportPath = ICUReportPathTemp; bloodApplyPath = bloodApplyPathTemp; @@ -118,95 +94,6 @@ public class XMLUtils { return document.getRootElement().asXML(); } - /** - * xml字符串转成对象 - */ - public static T xmlStrToObject(String xmlStr, Class type) throws Exception{ - if (StringUtils.isEmpty(xmlStr)) { - return null; - } - Document doc = null; // 将xml格式的字符串转换成Document对象 - T obj = null; // 创建 JavaBean 对象 - obj = type.newInstance(); - doc = DocumentHelper.parseText(xmlStr); - // 获取根节点 - Element root = doc.getRootElement(); - // 获取根节点下的所有元素 - List children = root.elements(); - // 循环所有子元素 - if (children != null && children.size() > 0) { - for (int i = 0; i < children.size(); i++) { - Element child = (Element) children.get(i); - Field[] fields = obj.getClass().getDeclaredFields(); - for (Field field : fields) { - field.setAccessible(true); - String fieldName = field.getName(); - if (fieldName.equals(child.getName())) { - Type genericType = field.getGenericType(); - Object[] args = new Object[1]; - String value = child.getTextTrim(); - - // 赋值 - PropertyDescriptor descriptor = new PropertyDescriptor(fieldName, type); - if (("java.lang.Integer").equals(genericType.getTypeName()) || genericType.getTypeName().equals("int")) { - if (value != null && value.length() > 0) { - args[0] = Integer.parseInt(value + ""); - descriptor.getWriteMethod().invoke(obj, args); - } - } else if ((Date.class.getName()).equals(genericType.getTypeName())) { - descriptor.getWriteMethod().invoke(obj, simpleDateFormat.parse(value, new ParsePosition(0))); - } else if (("java.lang.Long").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("long")) { - if (value != null && value.length() > 0) { - args[0] = Long.parseLong(value + ""); - descriptor.getWriteMethod().invoke(obj, args); - } - } else if (("java.lang.Boolean").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("boolean")) { - if (value != null && value.length() > 0) { - args[0] = Boolean.valueOf(value + ""); - descriptor.getWriteMethod().invoke(obj, args); - } - } else if (("java.lang.Double").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("double")) { - if (value != null && value.length() > 0) { - args[0] = Double.parseDouble(value + ""); - descriptor.getWriteMethod().invoke(obj, args); - } - } else if (("java.lang.Float").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("float")) { - if (value != null && value.length() > 0) { - args[0] = Float.parseFloat(value + ""); - descriptor.getWriteMethod().invoke(obj, args); - } - } else { - descriptor.getWriteMethod().invoke(obj, value); - } - break; - } - } - } - } - return obj; - } - - /** - * 修改V3xml内容 - */ - public static String generateV3XmlStr(String typeCodeValue, String textContent) throws Exception { - SAXReader reader = new SAXReader(); - Document document = reader.read(path); - Element root = document.getRootElement(); - - Element creationTime = root.element("creationTime"); - Attribute value = creationTime.attribute("value"); - value.setValue(new Date().toString()); - - Element acknowledgement = root.element("acknowledgement"); - Attribute typeCode = acknowledgement.attribute("typeCode"); - typeCode.setValue(typeCodeValue); - - Element acknowledgementDetail = acknowledgement.element("acknowledgementDetail"); - Element text = acknowledgementDetail.element("text"); - text.setText(textContent); - return document.getRootElement().asXML(); - } //--------------------------------------------向外抛出异常 public static MessageDto xpathToBean(String xmlStr, Class tClass, String source) throws Exception { @@ -313,24 +200,9 @@ public class XMLUtils { MessageDto messageDto = null; // 根据source判断是哪个实体类 switch (source) { - case InterfaceName.PARAMETER_ADMISSION: //入院 - messageDto = new MessageDto(ArchiveMaster.class.getName(), new ArchiveMaster(), AliasName.ADMISSION_RECORD, admissionRecordPath, source); - break; - case InterfaceName.PARAMETER_DISCHARGE: // 出院 - messageDto = new MessageDto(ArchiveMaster.class.getName(), new ArchiveMaster(), AliasName.DISCHARGE_RECORD, dischargeRecordPath, InterfaceName.PARAMETER_ADMISSION); - break; - case InterfaceName.PARAMETER_CANCELLATION_DISCHARGE: // 取消入院 - messageDto = new MessageDto(ArchiveMaster.class.getName(), new ArchiveMaster(), AliasName.CANCELLATION_DISCHARGE, admissionRecordPath, source); - break; - case InterfaceName.PARAMETER_TRANSFER: // 转科 - messageDto = new MessageDto(ArchiveMaster.class.getName(), new ArchiveMaster(), AliasName.TRANSFER_RECORD, transferRecordPath, source); - break; case InterfaceName.HANDNUMBNESS_REPORT: // 手麻系统 messageDto = new MessageDto(HandNumbnessReport.class.getName(), new HandNumbnessReport(), AliasName.HANDNUMBNESS_REPORT, handNumbnessReportPath, source); break; - case InterfaceName.PARAMETER_PATIENT_UPDATE: // 患者更新 - messageDto = new MessageDto(ArchiveMaster.class.getName(), new ArchiveMaster(), AliasName.PATIENT_UPDATE, patientUpdatePath, source); - break; case InterfaceName.ICU_REPORT: // ICU重症单 messageDto = new MessageDto(ICUReport.class.getName(), new ICUReport(), AliasName.ICU_REPORT, ICUReportPath, source); break; @@ -500,11 +372,20 @@ public class XMLUtils { } } else if (("java.lang.Double").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("double")) { if (value != null && value.length() > 0) { - descriptor.getWriteMethod().invoke(obj, Double.parseDouble(value + "")); + if(value.indexOf("-") != -1){ + descriptor.getWriteMethod().invoke(obj, Double.parseDouble("0.00")); + }else{ + descriptor.getWriteMethod().invoke(obj, Double.parseDouble(value + "")); + } } } else if (("java.lang.Float").equalsIgnoreCase(genericType.getTypeName()) || genericType.getTypeName().equals("float")) { if (value != null && value.length() > 0) { - descriptor.getWriteMethod().invoke(obj, Float.parseFloat(value + "")); + if(value.indexOf("-") != -1){ + descriptor.getWriteMethod().invoke(obj, Float.parseFloat("0.00")); + }else{ + descriptor.getWriteMethod().invoke(obj, Float.parseFloat(value + "")); + } + } } else { descriptor.getWriteMethod().invoke(obj, value);