住院条码修改
This commit is contained in:
parent
50472f7437
commit
90e5c95161
@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -64,23 +65,26 @@ public class ZycxServiceImpl implements ZycxService {
|
|||||||
@Override
|
@Override
|
||||||
public Result execSQD(String[] sqh,String userid,String status,String yljg) {
|
public Result execSQD(String[] sqh,String userid,String status,String yljg) {
|
||||||
String sqhOne = "";
|
String sqhOne = "";
|
||||||
|
List<String> pdfUrlList = new ArrayList<>();
|
||||||
for (int i = 0; i < sqh.length; i++) {
|
for (int i = 0; i < sqh.length; i++) {
|
||||||
sqhOne = sqh[i];
|
sqhOne = sqh[i];
|
||||||
if(sp.equals("1")){
|
if(sp.equals("1")){
|
||||||
Result result = execSQDExecSP(sqhOne, userid, status, yljg);
|
Result result = execSQDExecSP(sqhOne, userid, status, yljg);
|
||||||
if(!result.equals("0")) return result;
|
if(!result.getCode().equals("0")) return result;
|
||||||
}else{
|
}else{
|
||||||
Result result = execSQDExecHTTP(sqhOne, userid, status, yljg);
|
Result result = execSQDExecHTTP(sqhOne, userid, status, yljg);
|
||||||
if(!result.equals("0")) return result;
|
if(!result.getCode().equals("0")) return result;
|
||||||
}
|
}
|
||||||
//打印条码
|
//打印条码
|
||||||
if(status.equals("11")){
|
if(status.equals("11")){
|
||||||
printBarCode(sqhOne);
|
Result result = printBarCode(sqhOne);
|
||||||
|
if(!result.getCode().equals("0")) return result;
|
||||||
|
pdfUrlList.add(result.getData().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Result("0","执行成功!");
|
return new Result("0","执行成功!",pdfUrlList);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,6 +169,7 @@ public class ZycxServiceImpl implements ZycxService {
|
|||||||
public Result printBarCode(String sqh){
|
public Result printBarCode(String sqh){
|
||||||
LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh);
|
LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh);
|
||||||
//List<LabReqdetail> labReqdetailList = commonUtil.getLabReqdetailList(sqh);
|
//List<LabReqdetail> labReqdetailList = commonUtil.getLabReqdetailList(sqh);
|
||||||
|
if(labReqmainOne == null) return new Result("-1","未查到条码号:"+sqh+"的申请单数据!");
|
||||||
BarCodeParam barCodeParam = new BarCodeParam();
|
BarCodeParam barCodeParam = new BarCodeParam();
|
||||||
barCodeParam.setSqh(sqh);
|
barCodeParam.setSqh(sqh);
|
||||||
Map<String, String> ageFromBirthDay = LisUtil.getAgeFromBirthDay(DateUtil.format(labReqmainOne.getBrsr(), "yyyy-MM-dd HH:mm:ss"));
|
Map<String, String> ageFromBirthDay = LisUtil.getAgeFromBirthDay(DateUtil.format(labReqmainOne.getBrsr(), "yyyy-MM-dd HH:mm:ss"));
|
||||||
@ -188,8 +193,7 @@ public class ZycxServiceImpl implements ZycxService {
|
|||||||
barCodeParam.setBrxb(brxb);
|
barCodeParam.setBrxb(brxb);
|
||||||
barCodeParam.setSfxmmc(labReqmainOne.getJymd());
|
barCodeParam.setSfxmmc(labReqmainOne.getJymd());
|
||||||
log.info("传给打印的数据为:{},{}",barCodeParam,sqh);
|
log.info("传给打印的数据为:{},{}",barCodeParam,sqh);
|
||||||
reportUtil.printToPdf(barCodeParam,sqh);
|
return reportUtil.printToPdf(barCodeParam, sqh);
|
||||||
return new Result("0", "打印成功!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user