liquanyu / talkonline

Download as
Browse Code »

Commit 8655d121624b713b398a58f699b00439a93e849b

Authored by shiyang
1 parent ad198e810c
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 9 additions and 4 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java View file @ 8655d12
... ... @@ -236,7 +236,7 @@
236 236 //标价金额
237 237 paramMap.put("total_fee", String.valueOf(lymsOrder.getCnt() * lymsOrder.getPrice()));
238 238 //终端IP
239   - paramMap.put("spbill_create_ip", "119.90.57.26");
  239 + paramMap.put("spbill_create_ip", "111.206.6.150");
240 240 //通知地址
241 241 paramMap.put("notify_url", notifyUrl);
242 242 //交易类型
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java View file @ 8655d12
... ... @@ -1272,10 +1272,10 @@
1272 1272 .or().eq("idno", patient.getSynthesisQuery()));
1273 1273 }
1274 1274 if(StringUtil.isNotEmpty(patient.getStartCreatedtime())){
1275   - query.ge("createdtime", patient.getStartCreatedtime());
  1275 + query.ge("bookbuil_date", patient.getStartCreatedtime());
1276 1276 }
1277 1277 if(StringUtil.isNotEmpty(patient.getEndCreatedtime())){
1278   - query.le("createdtime", patient.getEndCreatedtime());
  1278 + query.le("bookbuil_date", patient.getEndCreatedtime());
1279 1279 }
1280 1280 Page<LymsPatient> page=new Page<>(current,size);
1281 1281 Page<LymsPatient> lymsPatientPage=lymsPatientService.page(page, query.orderByDesc("updatedtime","createdtime"));
talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java View file @ 8655d12
... ... @@ -207,7 +207,7 @@
207 207 @TableField(value = "bookbuil_hospital")
208 208 private String bookbuil_hospital;
209 209 /**
210   - * 建档类型
  210 + * 档案类型：1:妇科，2：儿科(以后可以在丰富类似套餐模式)
211 211 */
212 212 @TableField(value = "bookbuil_type")
213 213 private String bookbuil_type;
... ... @@ -281,6 +281,11 @@
281 281 */
282 282 @TableField(value = "jzs_info")
283 283 private String jzs_info;
  284 + /**
  285 + * 建档日期
  286 + */
  287 + @TableField(value = "bookbuil_date")
  288 + private Date bookbuil_date;
284 289  
285 290  
286 291