Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/api/medicallaboratory/MedicalLaboratoryController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import thyyxxk.webserver.api.medicallaboratory.model.PatientType;
 import thyyxxk.webserver.config.auth.PassToken;
 import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
@@ -116,7 +117,13 @@ public class MedicalLaboratoryController {
                 "\"url\":\"" + redirect + "\"}";
 
         JSONObject obj = new JSONObject();
-        obj.put("cardNo", body.getPatNo());
+        String cardNo;
+        if (null != body.getPatType() && body.getPatType() == PatientType.INPATIENT) {
+            cardNo = dao.getPatientIdByInpatientNo(body.getPatNo());
+        } else {
+            cardNo = body.getPatNo();
+        }
+        obj.put("cardNo", cardNo);
         obj.put("msgContext", JSON.parseObject(msgContent));
         wxServer.pushWxMessage(obj);
     }

src/main/java/thyyxxk/webserver/dao/his/api/MedicalLaboratoryDao.java

@@ -2,8 +2,12 @@ package thyyxxk.webserver.dao.his.api;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.api.medicallaboratory.MedicalLaboratoryState;
 
 @Mapper
 public interface MedicalLaboratoryDao extends BaseMapper<MedicalLaboratoryState> {
+
+    @Select("select rtrim(mz_no) from a_patient_mi where inpatient_no=#{patNo} ")
+    String getPatientIdByInpatientNo(String patNo);
 }