jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b601827b824a305b6d90b80d4f7661803d40e95c

Authored by litao@lymsh.com
2 parents 0931861544 8868460921
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml View file @ b601827
... ... @@ -96,15 +96,17 @@
96 96  
97 97 <select id="queryGroupHospitalServiceContent" resultMap="HospitalServiceContentResultMap"
98 98 parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
99   - select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content group by hospital_id;
  99 + select hospital_id,group_concat(ser_type) as ser_types,create_date,create_user from hospital_service_content
100 100 <include refid="HospitalServiceContentCondition"/>
  101 + group by hospital_id
101 102 <include refid="orderAndLimit"/>
102 103 </select>
103 104  
104 105 <select id="queryGroupHospitalServiceContentCount" resultType="int"
105 106 parameterType="com.lyms.platform.permission.model.HospitalServiceContentQuery">
106   - select count(1) from hospital_service_content group by hospital_id;
  107 + select count(1) from hospital_service_content
107 108 <include refid="HospitalServiceContentCondition"/>
  109 + group by hospital_id
108 110 </select>
109 111  
110 112  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java View file @ b601827
... ... @@ -95,7 +95,13 @@
95 95 baseResponse = (BaseResponse) ReflectionUtils.invokeMethod(mh, webApplicationContext.getBean(action), synForm);
96 96 }else{//无参数
97 97 Method mh = ReflectionUtils.findMethod(webApplicationContext.getBean(action).getClass(), method, null);
98   - baseResponse = (BaseResponse) ReflectionUtils.invokeMethod(mh, webApplicationContext.getBean(action), null);
  98 + if(mh!=null){
  99 + baseResponse = (BaseResponse) ReflectionUtils.invokeMethod(mh, webApplicationContext.getBean(action), null);
  100 + }else{
  101 + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  102 + baseResponse.setErrormsg("没有找到："+action+",中的："+method+"方法！请确认传入参数");
  103 + return baseResponse;
  104 + }
99 105 }
100 106 return baseResponse;
101 107 } catch (Exception e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java View file @ b601827
... ... @@ -183,11 +183,31 @@
183 183 }
184 184 }
185 185 }
  186 + if (StringUtils.isNotEmpty(hs.getCreateUser())) {
  187 + try {
  188 + Users users = usersService.getUsers(Integer.parseInt(hs.getCreateUser()));
  189 + if (users != null) {
  190 + result.setCreateUser(users.getName());
  191 + }
  192 + } catch (Exception e) {
  193 + result.setCreateUser("产检医生");
  194 + }
  195 + }
  196 +
  197 + if(StringUtils.isNotEmpty(hs.getSerTypes())){
  198 + String serTypes [] = hs.getSerTypes().split(",");
  199 + StringBuffer stb = new StringBuffer();
  200 + for(String st:serTypes){
  201 + String serType = PatientSerEnums.SerTypeEnums.getTitle(Integer.parseInt(st));
  202 + stb.append(serType+"/");
  203 + }
  204 + result.setSerType(stb.toString().substring(0,stb.length()-1));
  205 + }
  206 +
186 207 result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
187   - String serType = PatientSerEnums.SerTypeEnums.getTitle(hs.getSerType());
188   - result.setSerType(serType);
189   - result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
190   - result.setCreateUser(hs.getCreateUser());
  208 + if(hs.getStatus()!=null){
  209 + result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
  210 + }
191 211 return result;
192 212 }
193 213