|
|
@ -1018,14 +1018,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
|
|
|
//判断是否已经挂号，如果已经挂号
|
|
|
if(StringUtils.isNotBlank(outpatientDO.getConNo())&&StringUtils.isNotBlank(outpatientDO.getRegisterNo())){
|
|
|
|
|
|
net.sf.json.JSONObject res = new JSONObject();
|
|
|
res.put("@RESULT","0");
|
|
|
logger.info("已经挂号 res: " +res.toString());
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
net.sf.json.JSONObject rs = entranceService.BS10111(outpatientDO.getCardNo(),doctorMappingDO.getMappingCode(),outpatientDO.getDept(),null,outpatientDO.getWinNo(),demoFlag);
|
|
|
net.sf.json.JSONObject res = rs.getJSONObject("resquest");
|
|
|
logger.info("res: " +res.toString());
|
|
|
logger.info("挂号结果 res: " +res.toString());
|
|
|
String rsCode = res.getString("@RESULT");
|
|
|
if("0".equals(rsCode)){
|
|
|
//存储挂号号
|
|
|
@ -3109,18 +3112,18 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
endTime.setTime(new Date());
|
|
|
endTime.set(endTime.get(Calendar.YEAR),endTime.get(Calendar.MONTH),endTime.get(Calendar.DAY_OF_MONTH),23,59,59);
|
|
|
//今天协同门诊列表
|
|
|
List<WlyyOutpatientDO> todayList = outpatientDao.findByGeneralDoctor(generalDoctor,new Date(),endTime.getTime());
|
|
|
List<WlyyOutpatientDO> todayList = outpatientDao.findByGeneralDoctor(generalDoctor,new Date(),endTime.getTime(),"0");
|
|
|
|
|
|
rs.put("todayList",todayList);
|
|
|
|
|
|
Calendar tomorrowTime = Calendar.getInstance();
|
|
|
tomorrowTime.setTime(new Date());
|
|
|
tomorrowTime.add(Calendar.DAY_OF_MONTH,1);
|
|
|
tomorrowTime.set(endTime.get(tomorrowTime.YEAR),endTime.get(tomorrowTime.MONTH),endTime.get(tomorrowTime.DAY_OF_MONTH),00,00,00);
|
|
|
tomorrowTime.set(endTime.get(tomorrowTime.YEAR),endTime.get(tomorrowTime.MONTH),endTime.get(tomorrowTime.DATE),00,00,00);
|
|
|
|
|
|
endTime.add(Calendar.DAY_OF_MONTH,1);
|
|
|
tomorrowTime.add(Calendar.DATE,1);
|
|
|
endTime.add(Calendar.DATE,1);
|
|
|
//明天协同门诊列表
|
|
|
List<WlyyOutpatientDO> tomorrowList = outpatientDao.findByGeneralDoctor(generalDoctor,tomorrowTime.getTime(),endTime.getTime());
|
|
|
List<WlyyOutpatientDO> tomorrowList = outpatientDao.findByGeneralDoctor(generalDoctor,tomorrowTime.getTime(),endTime.getTime(),"0");
|
|
|
rs.put("tomorrowList",tomorrowList);
|
|
|
|
|
|
//统计科预约医生
|
