调整接口表年龄为字符串

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AfterIncidentDetailLog.java

@@ -187,7 +187,7 @@ public class AfterIncidentDetailLog implements Serializable {
 	/**价格;单价，必须使用数值型，如”12.5”*/
 	@Excel(name = "价格;单价，必须使用数值型，如”12.5”", width = 15)
     @ApiModelProperty(value = "价格;单价，必须使用数值型，如”12.5”")
-    private java.math.BigDecimal price;
+    private java.lang.Double price;
 	/**数量;数量，必须使用数值型，如”10”*/
 	@Excel(name = "数量;数量，必须使用数值型，如”10”", width = 15)
     @ApiModelProperty(value = "数量;数量，必须使用数值型，如”10”")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/HospitalizatioSettleDetail.java

@@ -111,7 +111,7 @@ public class HospitalizatioSettleDetail implements Serializable {
 	/**总发生金额;该项目单价*数量*/
 	@Excel(name = "总发生金额;该项目单价*数量", width = 15)
     @ApiModelProperty(value = "总发生金额;该项目单价*数量")
-    private java.math.BigDecimal cost;
+    private java.lang.Double cost;
 	/**用药天数;项目为药品时填写*/
 	@Excel(name = "用药天数;项目为药品时填写", width = 15)
     @ApiModelProperty(value = "用药天数;项目为药品时填写")
@@ -119,20 +119,20 @@ public class HospitalizatioSettleDetail implements Serializable {
 	/**医保范围内可支付金额;该项目医保范围内金额，如存在请提取*/
 	@Excel(name = "医保范围内可支付金额;该项目医保范围内金额，如存在请提取", width = 15)
     @ApiModelProperty(value = "医保范围内可支付金额;该项目医保范围内金额，如存在请提取")
-    private java.math.BigDecimal bmiConveredAmount;
+    private java.lang.Double bmiConveredAmount;
 	/**医保实际支付金额;该项目医保实际支付金额，医保医保实际支付金额=医保范围内可支付金额-拒付金额*/
 	@Excel(name = "医保实际支付金额;该项目医保实际支付金额，医保医保实际支付金额=医保范围内可支付金额-拒付金额", width = 15)
     @ApiModelProperty(value = "医保实际支付金额;该项目医保实际支付金额，医保医保实际支付金额=医保范围内可支付金额-拒付金额")
-    private java.math.BigDecimal bmiPayAmount;
+    private java.lang.Double bmiPayAmount;
 
     @Excel(name = "个人支付金额")
     @ApiModelProperty(value = "个人支付金额")
-    private java.math.BigDecimal individualPaymentAmount;
+    private java.lang.Double individualPaymentAmount;
 
 	/**拒付金额;已经拒付金额*/
 	@Excel(name = "拒付金额;已经拒付金额", width = 15)
     @ApiModelProperty(value = "拒付金额;已经拒付金额")
-    private java.math.BigDecimal amountRefusal;
+    private java.lang.Double amountRefusal;
 	/**拒付理由;拒付理由*/
 	@Excel(name = "拒付理由;拒付理由", width = 15)
     @ApiModelProperty(value = "拒付理由;拒付理由")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MasterAdmissionBill.java

@@ -163,7 +163,7 @@ public class MasterAdmissionBill implements Serializable {
 	/**患者年龄;如有患者年龄，则不需要患者出生日期。患者年龄或出生日期有一个字段即可*/
 	@Excel(name = "患者年龄;如有患者年龄，则不需要患者出生日期。患者年龄或出生日期有一个字段即可", width = 15)
     @ApiModelProperty(value = "患者年龄;如有患者年龄，则不需要患者出生日期。患者年龄或出生日期有一个字段即可")
-    private java.lang.Integer patientAge;
+    private java.lang.String patientAge;
 
     @Excel(name = "就诊日期", width = 15, format =  "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
@@ -225,6 +225,22 @@ public class MasterAdmissionBill implements Serializable {
 	@Excel(name = "出院诊断名称;结算系统出院诊断名称", width = 15)
     @ApiModelProperty(value = "出院诊断名称;结算系统出院诊断名称")
     private java.lang.String dischargeDiseaseNameMain;
+    /**入院诊断编码;结算系统入院诊断编码*/
+    @Excel(name = "入院诊断编码;结算系统入院诊断编码", width = 15)
+    @ApiModelProperty(value = "入院诊断编码;结算系统入院诊断编码")
+    private java.lang.String ybAdmissionDiseaseId;
+    /**入院诊断名称;结算系统入院诊断名称*/
+    @Excel(name = "入院诊断名称;结算系统入院诊断名称", width = 15)
+    @ApiModelProperty(value = "入院诊断名称;结算系统入院诊断名称")
+    private java.lang.String ybAdmissionDiseaseName;
+    /**出院诊断编码;结算系统出院诊断编码*/
+    @Excel(name = "出院诊断编码;结算系统出院诊断编码", width = 15)
+    @ApiModelProperty(value = "出院诊断编码;结算系统出院诊断编码")
+    private java.lang.String ybDischargeDiseaseIdMain;
+    /**出院诊断名称;结算系统出院诊断名称*/
+    @Excel(name = "出院诊断名称;结算系统出院诊断名称", width = 15)
+    @ApiModelProperty(value = "出院诊断名称;结算系统出院诊断名称")
+    private java.lang.String ybDischargeDiseaseNameMain;
 	/**医保支付方式;1.按项目 2.单病种 3.按病种分值 4.疾病诊断相关分值 5.按床日 6.按人头 9.其他*/
 	@Excel(name = "医保支付方式;1.按项目 2.单病种 3.按病种分值 4.疾病诊断相关分值 5.按床日 6.按人头 9.其他", width = 15)
     @ApiModelProperty(value = "医保支付方式;1.按项目 2.单病种 3.按病种分值 4.疾病诊断相关分值 5.按床日 6.按人头 9.其他")
@@ -240,31 +256,31 @@ public class MasterAdmissionBill implements Serializable {
 	/**医疗总发生费用*/
 	@Excel(name = "医疗总发生费用", width = 15)
     @ApiModelProperty(value = "医疗总发生费用")
-    private java.math.BigDecimal medfeeSumamt;
+    private java.lang.Double medfeeSumamt;
 	/**全自费金额*/
 	@Excel(name = "全自费金额", width = 15)
     @ApiModelProperty(value = "全自费金额")
-    private java.math.BigDecimal fulamtOwnpayAmt;
+    private java.lang.Double fulamtOwnpayAmt;
 	/**超限价自费费用*/
 	@Excel(name = "超限价自费费用", width = 15)
     @ApiModelProperty(value = "超限价自费费用")
-    private java.math.BigDecimal overlmtSelfpay;
+    private java.lang.Double overlmtSelfpay;
 	/**先行自付金额*/
 	@Excel(name = "先行自付金额", width = 15)
     @ApiModelProperty(value = "先行自付金额")
-    private java.math.BigDecimal preselfpayAmt;
+    private java.lang.Double preselfpayAmt;
 	/**符合政策范围金额*/
 	@Excel(name = "符合政策范围金额", width = 15)
     @ApiModelProperty(value = "符合政策范围金额")
-    private java.math.BigDecimal inscpScpAmt;
+    private java.lang.Double inscpScpAmt;
 	/**实际支付起付线*/
 	@Excel(name = "实际支付起付线", width = 15)
     @ApiModelProperty(value = "实际支付起付线")
-    private java.math.BigDecimal actPayDedc;
+    private java.lang.Double actPayDedc;
 	/**基本医疗保险统筹基金支出*/
 	@Excel(name = "基本医疗保险统筹基金支出", width = 15)
     @ApiModelProperty(value = "基本医疗保险统筹基金支出")
-    private java.math.BigDecimal hifpPay;
+    private java.lang.Double hifpPay;
 	/**基本医疗保险统筹基金支付比例*/
 	@Excel(name = "基本医疗保险统筹基金支付比例", width = 15)
     @ApiModelProperty(value = "基本医疗保险统筹基金支付比例")
@@ -272,31 +288,31 @@ public class MasterAdmissionBill implements Serializable {
 	/**公务员医疗补助资金支出*/
 	@Excel(name = "公务员医疗补助资金支出", width = 15)
     @ApiModelProperty(value = "公务员医疗补助资金支出")
-    private java.math.BigDecimal cvlservPay;
+    private java.lang.Double cvlservPay;
 	/**企业补充医疗保险基金支出*/
 	@Excel(name = "企业补充医疗保险基金支出", width = 15)
     @ApiModelProperty(value = "企业补充医疗保险基金支出")
-    private java.math.BigDecimal hifesPay;
+    private java.lang.Double hifesPay;
 	/**居民大病保险资金支出*/
 	@Excel(name = "居民大病保险资金支出", width = 15)
     @ApiModelProperty(value = "居民大病保险资金支出")
-    private java.math.BigDecimal hifmiPay;
+    private java.lang.Double hifmiPay;
 	/**职工大额医疗费用补助基金支出*/
 	@Excel(name = "职工大额医疗费用补助基金支出", width = 15)
     @ApiModelProperty(value = "职工大额医疗费用补助基金支出")
-    private java.math.BigDecimal hifobPay;
+    private java.lang.Double hifobPay;
 	/**医疗救助基金支出*/
 	@Excel(name = "医疗救助基金支出", width = 15)
     @ApiModelProperty(value = "医疗救助基金支出")
-    private java.math.BigDecimal mafPay;
+    private java.lang.Double mafPay;
 	/**其他支出*/
 	@Excel(name = "其他支出", width = 15)
     @ApiModelProperty(value = "其他支出")
-    private java.math.BigDecimal othPay;
+    private java.lang.Double othPay;
 	/**基金支付总额;基金支付总额 = 基本医保统筹基金支出（含职工基本医疗保险、居民基本医疗保险）+ 补充医疗保险基金支出 （含覆盖全体参保人的居民大病保险和大额医疗费用补助、覆盖部分参保人的企业职工大额医疗费用补助和公务员医疗补助等）+ 医疗救助基金支出 + 其他支出（如伤残人员医疗保障基金支出）*/
 	@Excel(name = "基金支付总额;基金支付总额 = 基本医保统筹基金支出（含职工基本医疗保险、居民基本医疗保险）+ 补充医疗保险基金支出 （含覆盖全体参保人的居民大病保险和大额医疗费用补助、覆盖部分参保人的企业职工大额医疗费用补助和公务员医疗补助等）+ 医疗救助基金支出 + 其他支出（如伤残人员医疗保障基金支出）", width = 15)
     @ApiModelProperty(value = "基金支付总额;基金支付总额 = 基本医保统筹基金支出（含职工基本医疗保险、居民基本医疗保险）+ 补充医疗保险基金支出 （含覆盖全体参保人的居民大病保险和大额医疗费用补助、覆盖部分参保人的企业职工大额医疗费用补助和公务员医疗补助等）+ 医疗救助基金支出 + 其他支出（如伤残人员医疗保障基金支出）")
-    private java.math.BigDecimal fundPaySumamt;
+    private java.lang.Double fundPaySumamt;
 
     /**事后监管状态;*/
     @ApiModelProperty(value = "事后监管状态; WAITING，DEALING，FINISH")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/AfterWaringLogJob.java

@@ -83,7 +83,7 @@ public class AfterWaringLogJob implements Job {
             afterIncidentDetailLog.setUse_day(hospitalizatioSettleDetail.getUseDay());
             afterIncidentDetailLog.setDose_form(hospitalizatioSettleDetail.getDosageForm());
             afterIncidentDetailLog.setDose_unit(hospitalizatioSettleDetail.getPackageUnit());
-            afterIncidentDetailLog.setPrice(new BigDecimal(hospitalizatioSettleDetail.getUnitPrice()));
+            afterIncidentDetailLog.setPrice(hospitalizatioSettleDetail.getUnitPrice());
             afterIncidentDetailLog.setDscg_bed(masterAdmissionBill.getAdmBed());
             afterIncidentDetailLog.setExpense_category(hospitalizatioSettleDetail.getPCategory());
 //            afterIncidentDetailLog.setInspectionSite();

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/AfterWaringLogTestJob.java

@@ -70,9 +70,9 @@ public class AfterWaringLogTestJob{
             afterIncidentDetailLog = new AfterIncidentDetailLog();
 
             afterIncidentDetailLog.setAfterIncidentLogId(afterIncidentLog.getId());
-//            afterIncidentDetailLog.setMedical_diagnose_name_str(masterAdmissionBill.getDischargeDiseaseNameMain());
-//            afterIncidentDetailLog.setMedical_diagnose_code_str(masterAdmissionBill.getDischargeDiseaseIdMain());
-            afterIncidentDetailLog.setAmount(hospitalizatioSettleDetail.getCost().doubleValue());
+            afterIncidentDetailLog.setMedical_diagnose_name_str(masterAdmissionBill.getDischargeDiseaseNameMain());
+            afterIncidentDetailLog.setMedical_diagnose_code_str(masterAdmissionBill.getDischargeDiseaseIdMain());
+            afterIncidentDetailLog.setAmount(hospitalizatioSettleDetail.getCost());
             afterIncidentDetailLog.setMedical_project_code(hospitalizatioSettleDetail.getItemId());
             afterIncidentDetailLog.setMedical_project_name(hospitalizatioSettleDetail.getItemName());
             afterIncidentDetailLog.setProject_name(hospitalizatioSettleDetail.getItemNameHosp());
@@ -85,7 +85,7 @@ public class AfterWaringLogTestJob{
             afterIncidentDetailLog.setUse_day(hospitalizatioSettleDetail.getUseDay());
             afterIncidentDetailLog.setDose_form(hospitalizatioSettleDetail.getDosageForm());
             afterIncidentDetailLog.setDose_unit(hospitalizatioSettleDetail.getPackageUnit());
-            afterIncidentDetailLog.setPrice(new BigDecimal(hospitalizatioSettleDetail.getUnitPrice()));
+            afterIncidentDetailLog.setPrice(hospitalizatioSettleDetail.getUnitPrice());
             afterIncidentDetailLog.setDscg_bed(masterAdmissionBill.getAdmBed());
             afterIncidentDetailLog.setExpense_category(hospitalizatioSettleDetail.getPCategory());
 //            afterIncidentDetailLog.setInspectionSite();
@@ -94,7 +94,12 @@ public class AfterWaringLogTestJob{
             afterIncidentDetailLog.setDiagnose_name_str(masterAdmissionBill.getDischargeDiseaseNameMain());
             afterIncidentDetailLog.setMedical_insurance_mark(masterAdmissionBill.getPayMethod());
             afterIncidentDetailLog.setMedical_specification(hospitalizatioSettleDetail.getDrugSpec());
-            afterIncidentDetailLog.setTotal_amount(masterAdmissionBill.getMedfeeSumamt().doubleValue());
+            afterIncidentDetailLog.setTotal_amount(masterAdmissionBill.getMedfeeSumamt());
+            afterIncidentDetailLog.setMedical_dept_code(masterAdmissionBill.getAdmissionDeptId());
+            afterIncidentDetailLog.setMedical_dept_name(masterAdmissionBill.getAdmissionDeptName());
+            afterIncidentDetailLog.setPatient_id(masterAdmissionBill.getPatientId());
+            afterIncidentDetailLog.setProject_name(masterAdmissionBill.getPatientName());
+            afterIncidentDetailLog.setPatient_age(masterAdmissionBill.getPatientAge());
 //            afterIncidentDetailLog.setOrderType();
 //            afterIncidentDetailLog.setOrderCatalog();
             afterIncidentDetailLogList.add(afterIncidentDetailLog);

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/AfterwardsAuditDataTest.java

@@ -57,6 +57,7 @@ public class AfterwardsAuditDataTest {
     private IAfterwardsAuditDetailService afterwardsAuditDetailService;
     @Autowired
     private AfterWaringLogTestJob afterWaringLogTestJob;
+    @Test
     public void testJob(){
         try {
             afterWaringLogTestJob.execute(null);