jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 34af7458450685f0c18691ea163a33c42442cbe9

Authored by jiangjiazhi
2 parents 79afce21d4 5e4805cd3e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java View file @ 34af745
... ... @@ -316,5 +316,35 @@
316 316 this.updateUser = updateUser;
317 317  
318 318 }
  319 +
  320 + @Override
  321 + public String toString() {
  322 + return "PatientService{" +
  323 + "id='" + id + '\'' +
  324 + ", parentid='" + parentid + '\'' +
  325 + ", pid='" + pid + '\'' +
  326 + ", perType=" + perType +
  327 + ", serType=" + serType +
  328 + ", serInfos=" + serInfos +
  329 + ", serDoct='" + serDoct + '\'' +
  330 + ", createDate=" + createDate +
  331 + ", createUserName='" + createUserName + '\'' +
  332 + ", createUser='" + createUser + '\'' +
  333 + ", serStatus=" + serStatus +
  334 + ", updateDate=" + updateDate +
  335 + ", updateUserName='" + updateUserName + '\'' +
  336 + ", updateUser='" + updateUser + '\'' +
  337 + ", hospitalId='" + hospitalId + '\'' +
  338 + ", serCode='" + serCode + '\'' +
  339 + ", status=" + status +
  340 + ", receiveDate=" + receiveDate +
  341 + ", receiveUser='" + receiveUser + '\'' +
  342 + ", backDate=" + backDate +
  343 + ", backUser='" + backUser + '\'' +
  344 + ", orderId='" + orderId + '\'' +
  345 + ", synStatus=" + synStatus +
  346 + ", isOld=" + isOld +
  347 + '}';
  348 + }
319 349 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java View file @ 34af745
... ... @@ -27,7 +27,7 @@
27 27 /**
28 28 * @auther yangfei
29 29 * @createTime 2017年10月12日 17时09分
30   - * @discription
  30 + * @discription 小程序调用开通服务调用接口
31 31 */
32 32 @Component
33 33 public class PatientServiceSysFacade implements SysBaseFacade {
34 34  
... ... @@ -48,9 +48,8 @@
48 48 JSONArray jsonArray = JSONArray.fromObject(synForm);
49 49 BaseResponse baseResponse = new BaseResponse();
50 50 for (int i = 0; i < jsonArray.size(); i++) {
51   - // JSONObject jsonObject = JSONObject.fromObject(synForm);
52   - // PatientService patientService = (PatientService)JSONObject.toBean(jsonObject, PatientService.class);
53 51 PatientService patientService = (PatientService) JSONObject.toBean(jsonArray.getJSONObject(i), PatientService.class);
  52 + // System.out.println("请求参数转换结果："+patientService);
54 53 baseResponse = validate(patientService);
55 54 if (baseResponse.getErrorcode() != ErrorCodeConstants.SUCCESS) {
56 55 return baseResponse;
... ... @@ -131,7 +130,7 @@
131 130 }
132 131 } else {//孕妇建档服务数据处理
133 132 Patients patient = new Patients();
134   - if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == patientService.getSerType()) {//孕期精准指导同步到建档
  133 + if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == patientService.getSerType()) {//孕期精准指导同步到建档
135 134 patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
136 135 if (patientService.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) {
137 136 patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());