jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 02bacd31aa4c652806ae19a3e71c0b366ecf86ec

Authored by litao@lymsh.com
1 parent 12c80e4554
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

新生儿访视明细

Showing 6 changed files with 70 additions and 6 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java View file @ 02bacd3
... ... @@ -86,5 +86,9 @@
86 86 List<String> findSendUserIds(Map<String, Object> param);
87 87  
88 88 List<String> findUsedUserIds(Map<String, Object> param);
  89 +
  90 + String getUserName(String doctor);
  91 +
  92 + String getHospitalName(String visitHospitalId);
89 93 }
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml View file @ 02bacd3
... ... @@ -21,6 +21,14 @@
21 21 sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status
22 22 </sql>
23 23  
  24 + <select id="getUserName" parameterType="string" resultType="string">
  25 + select name from users where id = #{id}
  26 + </select>
  27 +
  28 + <select id="getHospitalName" parameterType="string" resultType="string">
  29 + select name from organization where id = #{id}
  30 + </select>
  31 +
24 32 <select id="findList" parameterType="map" resultMap="couponInfoMap">
25 33 select id,<include refid="columnList" /> from coupon_info
26 34 <where>
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 02bacd3
... ... @@ -250,6 +250,21 @@
250 250 }
251 251 }
252 252  
  253 + public static String getYyyyMmDd(Date d) {
  254 + if (d == null) {
  255 + return null;
  256 + }
  257 + try {
  258 + return y_m_d.format(d);
  259 + } catch (Exception e) {
  260 + return null;
  261 + }
  262 + }
  263 +
  264 + public static void main(String[] args) {
  265 + System.out.println(getYyyyMmDd(new Date()));
  266 + }
  267 +
253 268 public static Date parseYMD(String s) {
254 269 if (s == null) {
255 270 return null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java View file @ 02bacd3
... ... @@ -62,7 +62,7 @@
62 62 }
63 63  
64 64 /**
65   - * 新生儿访视详情
  65 + * 新生儿访视修改
66 66 * @param id
67 67 * @return
68 68 */
... ... @@ -71,6 +71,18 @@
71 71 @TokenRequired
72 72 public BaseObjectResponse get(@PathVariable String id) {
73 73 return visitService.get(id);
  74 + }
  75 +
  76 + /**
  77 + * 新生儿访视详情
  78 + * @param id
  79 + * @return
  80 + */
  81 + @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
  82 + @ResponseBody
  83 + @TokenRequired
  84 + public BaseObjectResponse info(@PathVariable String id) {
  85 + return visitService.info(id);
74 86 }
75 87  
76 88 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java View file @ 02bacd3
... ... @@ -21,5 +21,7 @@
21 21 BaseObjectResponse get(String id);
22 22  
23 23 BaseObjectResponse delete(String id);
  24 +
  25 + BaseObjectResponse info(String id);
24 26 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 02bacd3
... ... @@ -15,6 +15,8 @@
15 15 import com.lyms.platform.operate.web.utils.CollectionUtils;
16 16 import com.lyms.platform.operate.web.utils.MongoUtil;
17 17 import com.lyms.platform.operate.web.utils.ResponseUtil;
  18 +import com.lyms.platform.permission.dao.master.CouponMapper;
  19 +import com.lyms.platform.permission.dao.slave.OrganizationMapper;
18 20 import com.lyms.platform.permission.dao.slave.UsersMapper;
19 21 import com.lyms.platform.permission.model.Users;
20 22 import com.lyms.platform.pojo.*;
... ... @@ -53,8 +55,8 @@
53 55 @Autowired
54 56 private MongoUtil mongoUtil;
55 57  
56   -// @Autowired
57   - private UsersMapper usersMapper;
  58 + @Autowired
  59 + private CouponMapper mapper;
58 60  
59 61 @Override
60 62 public BaseObjectResponse init() {
... ... @@ -174,8 +176,8 @@
174 176 }
175 177 temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class));
176 178 temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class));
177   - Users users = usersMapper.getUsers(Integer.parseInt(visit.getDoctor()));
178   - temp.put("doctorName", users == null ? null : users.getName());
  179 +// Users users = mapper.getUsers(Integer.parseInt(visit.getDoctor()));
  180 +// temp.put("doctorName", users == null ? null : users.getName());
179 181 }
180 182  
181 183 }
182 184  
... ... @@ -247,8 +249,29 @@
247 249  
248 250 @Override
249 251 public BaseObjectResponse delete(String id) {
250   - mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), NewbornVisit.class);
  252 + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("yn", "0"), NewbornVisit.class);
251 253 return RespBuilder.buildSuccess();
  254 + }
  255 +
  256 + @Override
  257 + public BaseObjectResponse info(String id) {
  258 + NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class);
  259 + if(newbornVisit != null) {
  260 + Map<String, Object> restMap = new HashMap<>();
  261 + restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); /** 产后天数 */
  262 + restMap.put("visitHospitalId", mapper.getHospitalName(newbornVisit.getVisitHospitalId())); /** 访视机构 */
  263 + restMap.put("doctor", mapper.getUserName(newbornVisit.getDoctor())); /** 访视医生 */
  264 + restMap.put("checkTime", DateUtil.getYyyyMmDd(newbornVisit.getCheckTime())); /** 访视时间 */
  265 +
  266 + }
  267 +
  268 + // Users users = usersMapper.getUsers(Integer.parseInt(newbornVisit.getVisitHospitalId()));
  269 +// if(users != null) {
  270 +// newbornVisit.setVisitHospitalId(users.getName());
  271 +// } else {
  272 +// newbornVisit.setVisitHospitalId("");
  273 +// }
  274 + return null;
252 275 }
253 276  
254 277 }