liquanyu / regional-platform

Download as
Browse Code »

Commit 2e1ab3e7ca68f046db50137911e7e00cdfd07005

Authored by liquanyu
1 parent c12df6c48c
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 11 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 2e1ab3e
... ... @@ -1134,7 +1134,15 @@
1134 1134 doctorObj.put("name", "产科病房");
1135 1135 } else {
1136 1136 Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
1137   - doctorObj.put("name", users.getName());
  1137 + if (users != null)
  1138 + {
  1139 + doctorObj.put("name", users.getName());
  1140 + }
  1141 + else
  1142 + {
  1143 + doctorObj.put("name", "");
  1144 + }
  1145 +
1138 1146 }
1139 1147 result.setBuildDoctor(doctorObj);
1140 1148 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 2e1ab3e
... ... @@ -1204,7 +1204,7 @@
1204 1204  
1205 1205 boolean isShowNavel = false;
1206 1206 int monthes = DateUtil.getBabyAgeMonth(birthDate,date);
1207   - if (monthes == 1 || monthes == 3)
  1207 + if (monthes == 1 || monthes == 1 || monthes == 3)
1208 1208 {
1209 1209 isShowNavel = true;
1210 1210 }
platform-operate-api/src/main/resources/spring/applicationContext.xml View file @ 2e1ab3e
... ... @@ -36,7 +36,7 @@
36 36 <import resource="classpath:/spring/applicationContext-slave.xml"/>-->
37 37  
38 38 <!--医院单机版的时候需要打开-->
39   - <import resource="classpath:/spring/applicationContext-quartz.xml"/>
  39 + <!--<import resource="classpath:/spring/applicationContext-quartz.xml"/>-->
40 40  
41 41  
42 42 <task:annotation-driven/>