药品追溯码

src/main/java/cn/hnthyy/thmz/service/yb/YbService.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -106,10 +107,13 @@ public class YbService {
         }
         int randomNumber = new Random().nextInt(90) + 10;
         String rtalDocno = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-        if("1".equals(selInfo.getMdtrtSetlType())) {
-            selInfo.setMdtrtSn(zyActpatientMapper.selectMdtrtId(selInfo.getPatientId(), selInfo.getTimes()));
+        String mdtrtId = zyActpatientMapper.selectMdtrtId(selInfo.getPatientId(), selInfo.getTimes());
+        if(StringUtils.isNotBlank(mdtrtId)) {
+            selInfo.setMdtrtSn(mdtrtId);
+            selInfo.setMdtrtSetlType("1");
         } else {
             selInfo.setMdtrtSn(rtalDocno + randomNumber);
+            selInfo.setMdtrtSetlType("2");
         }
         selInfo.setRtalDocno(rtalDocno + randomNumber);
         selInfo.setFixmedinsBchno(rtalDocno + randomNumber);