diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java index 7547115..72f5425 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java @@ -276,7 +276,6 @@ public class CouponPrintController extends BaseController{ } System.out.println(model.toString()); String result = HospitalCouponPrintUtils.qhdCouponUse(model); - System.out.print(result); if("0".equals(result)){ int count = couponService.updateCouponStatus(param); System.out.println("update coupon count " + count); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index e2bf171..5f5a881 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.worker.QuanPatientWorker; import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; @@ -883,7 +884,23 @@ public class PatientFacade { patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); patientManagerQueryModel.setBuildWeek(dueWeek); - patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName()); + + String bookbuildingDoctor = ""; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) + { + Users user = usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())); + if (user != null) + { + bookbuildingDoctor = user.getName(); + } + else + { + System.out.println(patients.getId()+";no user bookbuildingDoctor"+patients.getBookbuildingDoctor()); + } + } + + + patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor); patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java index 1e81ae6..90e2c30 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java @@ -105,8 +105,7 @@ public class HospitalCouponPrintUtils { public static String qhdCouponUse(QhdDjq model){ String json = JsonUtil.obj2Str(model); System.out.println(json); - String result = "0"; - //String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8"); + String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8"); System.out.println("result= "+result); return result; }