From d3bf339bd64d7b7efddc0afdd4beb1866b8b5a04 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期六, 21 九月 2024 00:47:55 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java index 41db978..b9522e6 100644 --- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java @@ -183,6 +183,16 @@ public int deletePatMedInhospByInhospid(Long inhospid) { return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid); } + /** + * 鍒犻櫎鎮h�呬綇闄㈣褰曚俊鎭� + * + * @param inhospno 鎮h�呬綇闄㈢紪鐮� + * @return 缁撴灉 + */ + @Override + public int deletePatMedInhospByInhospno(String inhospno) { + return patMedInhospMapper.deletePatMedInhospByInhospno(inhospno); + } @Override @@ -296,17 +306,27 @@ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class); serviceSubtask.setTaskid(serviceTask.getTaskid()); serviceSubtask.setLibtemplateid(stt.getTemplateid()); + serviceSubtask.setNurseId(patMedInhosp1.getNurseId()); + serviceSubtask.setNurseName(patMedInhosp1.getNurseName()); + serviceSubtask.setDrcode(patMedInhosp1.getDrcode()); + serviceSubtask.setDrname(patMedInhosp1.getDrname()); + serviceSubtask.setDeptname(patMedInhosp1.getLeaveldeptname()); serviceSubtask.setTemplateid(stt.getId()); serviceSubtask.setTemplatename(stt.getSvyname()); serviceSubtask.setPatid(patArchive.getId()); serviceSubtask.setSendname(patArchive.getName()); + serviceSubtask.setSfzh(patArchive.getIdcardno()); serviceSubtask.setPhone(patArchive.getTelcode()); serviceSubtask.setSex(patArchive.getSex()); serviceSubtask.setAge(patArchive.getAge()); serviceSubtask.setSendstate(2L); + serviceSubtask.setStarttime(patMedInhosp1.getStarttime()); + serviceSubtask.setEndtime(patMedInhosp1.getEndtime()); serviceSubtask.setServiceType("2"); serviceSubtask.setServiceform(serviceTask.getPreachform()); serviceSubtask.setHospType("2"); + serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode()); + serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname()); //璁剧疆鍙戦�佹椂闂� Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay()); serviceSubtask.setLongSendTime(newDate); -- Gitblit v1.9.3