首頁 探索 說明
註冊 登入
Amoy2
/
wlyy2.0
關註 5
讚好 1
複刻 18
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Trick 5 年之前
父節點
bc8ede295b 5502671797
當前提交
81af557cd7
共有 4 個文件被更改，包括 23 次插入 和 6 次删除
分割檢視 顯示文件統計
  1. 6 3
      business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java
  2. 1 1
      business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java
  3. 14 0
      common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java
  4. 2 2
      svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/third/SfRoutePushController.java

+ 6 - 3
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionExpressageService.java
查看文件 

@ -425,10 +425,10 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
 
        for (Object o : child) {
 
            Element routinfoe = (Element) o;
 
            WlyyPrescriptionExpressageLogDO sflog = new WlyyPrescriptionExpressageLogDO();
 
            String accept_time = routinfoe.attributeValue("accepttime");
 
            String accept_address = routinfoe.attributeValue("acceptaddress");
 
            String accept_time = routinfoe.attributeValue("acceptTime");
 
            String accept_address = routinfoe.attributeValue("acceptAddress");
 
            String accept_remark = routinfoe.attributeValue("remark");
 
            String opcode = routinfoe.attributeValue("opcode");
 
            String opcode = routinfoe.attributeValue("opCode");
 
            String mailno = routinfoe.attributeValue("mailno");
 
            String orderid = routinfoe.attributeValue("orderid");
 
@ -466,6 +466,8 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
 
        //根据快递单号获取处方配送详细信息
 
        WlyyPrescriptionExpressageDO sfexpress = prescriptionExpressageDao.findByPrescriptionExpressMailno(mailno);
 
        //根据门诊id获取处方详细信息
 
        List<WlyyPrescriptionDO> sfprescription = prescriptionDao.findByOutpatientId(sfexpress.getOutpatientId());
 
        //根据快递单号获取本地的路由信息
 
        List<WlyyPrescriptionExpressageLogDO> localroutinfos = prescriptionExpressageLogDao.queryByOutpatientId(sfexpress.getOutpatientId());
 
        //需要增量更新到本地的路由信息集合
 
@ -496,6 +498,7 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
 
                    continue;
 
                }else{
 
                    pushlog.setOutpatientId(sfexpress.getOutpatientId());
 
                    pushlog.setPrescriptionId(sfprescription.get(0).getId());
 
                    newroutinfolist.add(pushlog);
 
                }
 
            }

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java
查看文件 

@ -177,7 +177,7 @@ public class WlyyBusinessService {
 
            idcard = basePatientDO.getIdcard();
 
    
            JSONObject param = new JSONObject();
 
            param.put("idCard",idcard);
 
            param.put("idcard",idcard);
 
            JSONObject rs = wlyyHttpService.sendWlyyMes("wlyyGetPatientAccetokenByIdcard",param);
 
            if(rs!=null){
 
                Integer status = rs.getInteger("status");

+ 14 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java
查看文件 

@ -29,6 +29,11 @@ public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntity {
 
	 */
 
	private String outpatientId;
 
    /**
 
     * 关联表wlyy_prescription id
 
     */
 
    private String prescriptionId;
 
    /**
 
	 * 关联wlyy_prescription_expressage id
 
	 */
 
@ -151,6 +156,15 @@ public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntity {
 
        this.outpatientId = outpatientId;
 
    }
 
    @Column(name = "prescription_id")
 
    public String getPrescriptionId() {
 
        return prescriptionId;
 
    }
 
    public void setPrescriptionId(String prescriptionId) {
 
        this.prescriptionId = prescriptionId;
 
    }
 
	@Column(name = "expressage_id")
 
    public String getExpressageId() {
 
        return expressageId;

+ 2 - 2
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/third/SfRoutePushController.java
查看文件 

@ -22,7 +22,7 @@ import java.net.URLDecoder;
 
 * Created at 2019/11/7
 
 */
 
@RestController
 
@RequestMapping(value ="/openRoutePush")
 
@RequestMapping(value ="/open/sfRoutePush")
 
@Api(value = "顺丰路由推送", description = "顺丰路由推送", tags = {"hospital-entrance顺丰路由推送"})
 
public class SfRoutePushController extends EnvelopRestEndpoint {
 
@ -32,7 +32,7 @@ public class SfRoutePushController extends EnvelopRestEndpoint {
 
    private PrescriptionExpressageService sfexpressService;
 
    private String successxml = "<Response service='RoutePushService'><Head>OK</Head></Response>";
 
    private String failedxml = "<Response service='RoutePushService'><Head>ERR</Head><ERROR code='-1'>系统发生数据错误或运行时异常</ERROR></Response>";
 
    private String failedxml = "<Response service='RoutePushService'><Head>ERR</Head><ERROR code='4001'>系统发生数据错误或运行时异常</ERROR></Response>";
 
    @RequestMapping(value="/routepushservice",method = RequestMethod.POST)
 
    @ApiOperation("顺丰路由信息推送")