事中住院接口

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

@@ -108,10 +108,10 @@ public class MidIncidentVisitDetailLog implements Serializable {
 	@Excel(name = "医保项目名称", width = 15)
     @ApiModelProperty(value = "医保项目名称")
     private java.lang.String medicalProjectName;
-	/**发票项目编号*/
-	@Excel(name = "发票项目编号", width = 15)
-    @ApiModelProperty(value = "发票项目编号")
-    private java.lang.String invoiceProject;
+//	/**发票项目编号*/
+//	@Excel(name = "发票项目编号", width = 15)
+//    @ApiModelProperty(value = "发票项目编号")
+//    private java.lang.String invoiceProject;
 	/**费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费*/
 	@Excel(name = "费用类别;床位费、诊查费、检查费、化验费、治疗费、手术费、护理费、卫生材料费、西药费、中药饮片费", width = 15)
     @ApiModelProperty(value = "01\t床位费\n" +

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -980,7 +980,7 @@ public class RuleEngine {
                 midIncidentVisitDetailLog.setVisitNo(midIncidentVisitLog.getVisitNo());
                 midIncidentVisitDetailLog.setVisitType(midIncidentVisitLog.getVisitType());
                 midIncidentVisitDetailLog.setInspectionSite(adviceDetailsVO.getInspection_site());
-                midIncidentVisitDetailLog.setInvoiceProject(adviceDetailsVO.getInvoice_project());
+//                midIncidentVisitDetailLog.setInvoiceProject(adviceDetailsVO.getInvoice_project());
                 midIncidentVisitDetailLog.setMedicalInsuranceMark(adviceDetailsVO.getMedical_insurance_mark());
                 midIncidentVisitDetailLog.setMedicalNumber(adviceDetailsVO.getQuantity());
                 midIncidentVisitDetailLog.setOrderType(adviceDetailsVO.getOrder_type());
@@ -996,6 +996,9 @@ public class RuleEngine {
                     midIncidentVisitDetailLog.setPrice(new BigDecimal(adviceDetailsVO.getPrice()));
                 }
                 midIncidentVisitDetailLog.setRecipeNo(adviceDetailsVO.getRecipe_no());
+                if(null == adviceDetailsVO.getUse_day() || adviceDetailsVO.getUse_day()<=0){
+                    adviceDetailsVO.setUse_day(1);
+                }
                 midIncidentVisitDetailLog.setUseDay(adviceDetailsVO.getUse_day());
                 midIncidentVisitDetailLog.setProjectType(adviceDetailsVO.getProject_type());
                 midIncidentVisitDetailLog.setProejctCode(adviceDetailsVO.getProject_code());