Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescriptionPC/PrescriptionExpressagePCController.java

@@ -27,7 +27,7 @@ public class PrescriptionExpressagePCController extends BaseController {
    public String getMedicine(
            @ApiParam(required = true, name = "code", value = "二维码（居民取药码、健管师取药码）") @RequestParam(value = "code", required = true) String code){
        try{
            JSONObject jSONObject = prescriptionExpressagePCService.getMedicine(code,getRepUID());
            JSONObject jSONObject = prescriptionExpressagePCService.getMedicine(code,getUID());
//            jSONObject.toString().replace("\\","");
            return write(200, "获取信息成功！", "data", jSONObject);
        }catch (Exception e) {
@@ -41,7 +41,7 @@ public class PrescriptionExpressagePCController extends BaseController {
    public String fetchingMedicine(
            @ApiParam(required = true, name = "code", value = "二维码（居民取药码、健管师取药码）") @RequestParam(value = "code", required = true) String code){
        try {
            prescriptionExpressagePCService.fetchingMedicine(code, getRepUID());
            prescriptionExpressagePCService.fetchingMedicine(code, getUID());
            return write(200, "更改成功！");
        }catch (Exception e) {
            error(e);