diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java index 0f23848..d8ed4ee 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java @@ -236,7 +236,7 @@ public class OrderController { //标价金额 paramMap.put("total_fee", String.valueOf(lymsOrder.getCnt() * lymsOrder.getPrice())); //终端IP - paramMap.put("spbill_create_ip", "119.90.57.26"); + paramMap.put("spbill_create_ip", "111.206.6.150"); //通知地址 paramMap.put("notify_url", notifyUrl); //交易类型 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java index 346b9c3..a6957b5 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -1272,10 +1272,10 @@ public class PatientController { .or().eq("idno", patient.getSynthesisQuery())); } if(StringUtil.isNotEmpty(patient.getStartCreatedtime())){ - query.ge("createdtime", patient.getStartCreatedtime()); + query.ge("bookbuil_date", patient.getStartCreatedtime()); } if(StringUtil.isNotEmpty(patient.getEndCreatedtime())){ - query.le("createdtime", patient.getEndCreatedtime()); + query.le("bookbuil_date", patient.getEndCreatedtime()); } Page page=new Page<>(current,size); Page lymsPatientPage=lymsPatientService.page(page, query.orderByDesc("updatedtime","createdtime")); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java index 72b23ea..30edd83 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java @@ -207,7 +207,7 @@ public class LymsPatient implements Serializable { @TableField(value = "bookbuil_hospital") private String bookbuil_hospital; /** - * 建档类型 + * 档案类型:1:妇科,2:儿科(以后可以在丰富类似套餐模式) */ @TableField(value = "bookbuil_type") private String bookbuil_type; @@ -281,6 +281,11 @@ public class LymsPatient implements Serializable { */ @TableField(value = "jzs_info") private String jzs_info; + /** + * 建档日期 + */ + @TableField(value = "bookbuil_date") + private Date bookbuil_date;