Browse Source

修改就诊通知接口

lighter 4 years ago
parent
commit
38b4ee9f41

+ 8 - 0
src/main/java/thyyxxk/webserver/dao/his/triage/TriageDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
+import thyyxxk.webserver.entity.triage.MessageForPush;
 import thyyxxk.webserver.entity.triage.MzYshTzxx;
 import thyyxxk.webserver.entity.triage.MzfzPatientOrder;
 import thyyxxk.webserver.entity.triage.MzfzZdDeptRoom;
@@ -187,4 +188,11 @@ public interface TriageDao {
             "(#{patientId},#{visitDate},#{valueSg},#{valueTz},#{valueTw},#{valueMb}, " +
             "#{valueHx},#{valueSsy},#{valueSzy},#{visitRemark})")
     void insertMzVitalSigns(MzYshTzxx param);
+
+    @Select("select dept_code,rtrim(room_code) as room_code,serial_no,rtrim(name) as name,fz_no, " +
+            "deptName=(select rtrim(name) from zd_unit_code where code=dept_code), " +
+            "roomNo=(select room_no from mzfz_zd_dept_room where " +
+            "mzfz_patient_order.room_code=mzfz_zd_dept_room.room_code) " +
+            "from mzfz_patient_order where serial_no=#{serialNo}")
+    MessageForPush selectMessageForPush(@Param("serialNo") int serialNo);
 }

+ 4 - 2
src/main/java/thyyxxk/webserver/service/triage/TriageService.java

@@ -179,9 +179,11 @@ public class TriageService {
     }
 
     public ResultVo<String> notifyMessage(MessageForPush param) {
-        log.info("消息推送>>> {}", param);
+        MessageForPush prm = dao.selectMessageForPush(param.getSerialNo());
+        prm.setAction(param.getAction());
+        log.info("消息推送>>> {}", prm);
         RestTemplate template = new RestTemplate();
-        String result = template.postForObject(triageNotifyUrl, param, String.class);
+        String result = template.postForObject(triageNotifyUrl, prm, String.class);
         return ResultVoUtil.success(result);
     }
 }