ソースを参照

总金额字段补充

0027005599 2 年 前
コミット
c873045337

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

@@ -182,7 +182,8 @@ public class AfterIncidentDetailLog implements Serializable {
 	/**规格*/
 	@Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
-    private java.lang.String medicalSpecification;
+    @TableField(value = "medical_specification")
+    private java.lang.String medical_specification;
 	/**价格;单价,必须使用数值型,如”12.5”*/
 	@Excel(name = "价格;单价,必须使用数值型,如”12.5”", width = 15)
     @ApiModelProperty(value = "价格;单价,必须使用数值型,如”12.5”")
@@ -231,6 +232,8 @@ public class AfterIncidentDetailLog implements Serializable {
     @ApiModelProperty(value = "医保标志")
     @TableField(value = "medical_insurance_mark")
     private java.lang.String medical_insurance_mark;
+    @TableField(value = "total_amount")
+    private java.lang.Double total_amount;
 	/**检查部位*/
 	@Excel(name = "检查部位", width = 15)
     @ApiModelProperty(value = "检查部位")

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

@@ -91,6 +91,8 @@ public class AfterWaringLogJob implements Job {
             afterIncidentDetailLog.setDiagnose_code_str(masterAdmissionBill.getDischargeDiseaseIdMain());
             afterIncidentDetailLog.setDiagnose_name_str(masterAdmissionBill.getDischargeDiseaseNameMain());
             afterIncidentDetailLog.setMedical_insurance_mark(masterAdmissionBill.getPayMethod());
+            afterIncidentDetailLog.setMedical_specification(hospitalizatioSettleDetail.getDrugSpec());
+            afterIncidentDetailLog.setTotal_amount(masterAdmissionBill.getMedfeeSumamt().doubleValue());
 //            afterIncidentDetailLog.setOrderType();
 //            afterIncidentDetailLog.setOrderCatalog();
             afterIncidentDetailLogList.add(afterIncidentDetailLog);

+ 1 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterIncidentLogServiceImpl.java

@@ -36,6 +36,7 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
         afterIncidentLog.setVisitType(Constant.TREAMENT_TYPE_HOSP);
         afterIncidentLog.setInHospDate(masterAdmissionBill.getAdmissionDate());
         afterIncidentLog.setState(Constant.WATING);
+        afterIncidentLog.
         Integer medicalINsurance = 0;
         if(!"0".equals(masterAdmissionBill.getPayMethod())){
             medicalINsurance = 1;