jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit b2f8d2c5b26568899123ab663dd982aea461b155

Authored by liquanyu
1 parent 4980d8b4cc
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 3 changed files with 19 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java View file @ b2f8d2c
... ... @@ -276,7 +276,6 @@
276 276 }
277 277 System.out.println(model.toString());
278 278 String result = HospitalCouponPrintUtils.qhdCouponUse(model);
279   - System.out.print(result);
280 279 if("0".equals(result)){
281 280 int count = couponService.updateCouponStatus(param);
282 281 System.out.println("update coupon count " + count);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ b2f8d2c
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.operate.web.worker.WorkHR;
17 17 import com.lyms.platform.permission.model.Organization;
18 18 import com.lyms.platform.permission.model.OrganizationQuery;
  19 +import com.lyms.platform.permission.model.Users;
19 20 import com.lyms.platform.permission.service.OrganizationService;
20 21 import com.lyms.platform.permission.service.UsersService;
21 22 import com.lyms.platform.pojo.*;
... ... @@ -883,7 +884,23 @@
883 884 patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
884 885 patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
885 886 patientManagerQueryModel.setBuildWeek(dueWeek);
886   - patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName());
  887 +
  888 + String bookbuildingDoctor = "";
  889 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(patients.getBookbuildingDoctor()))
  890 + {
  891 + Users user = usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor()));
  892 + if (user != null)
  893 + {
  894 + bookbuildingDoctor = user.getName();
  895 + }
  896 + else
  897 + {
  898 + System.out.println(patients.getId()+";no user bookbuildingDoctor"+patients.getBookbuildingDoctor());
  899 + }
  900 + }
  901 +
  902 +
  903 + patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
887 904 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
888 905 patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
889 906 patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java View file @ b2f8d2c
... ... @@ -105,8 +105,7 @@
105 105 public static String qhdCouponUse(QhdDjq model){
106 106 String json = JsonUtil.obj2Str(model);
107 107 System.out.println(json);
108   - String result = "0";
109   - //String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8");
  108 + String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8");
110 109 System.out.println("result= "+result);
111 110 return result;
112 111 }