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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -128,6 +128,10 @@ public class YkyyEntranceService {
    public void save(Object object){
        hibenateUtils.save(object);
    }
    public void update(String id,Integer status){
        hibenateUtils.update(id,status);
    }
    /**
     * 同步科室信息
     * @return

business/base-service/src/main/java/com/yihu/jw/utils/hibernate/HibenateUtils.java

@@ -1,6 +1,8 @@
package com.yihu.jw.utils.hibernate;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.prescription.HlwCf01DO;
import com.yihu.jw.entity.hospital.prescription.HlwCf02DO;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -175,10 +177,11 @@ public class HibenateUtils {
        entityManager.flush();
    }
    public void update(String id,String phone){
        BasePatientDO basePatientDO = entityManager.find(BasePatientDO.class,id);
        basePatientDO.setPhone(phone);
        update(basePatientDO);
    public void update(String id,Integer status){
        HlwCf01DO hlwCf01DO = entityManager.find(HlwCf01DO.class,id);
        hlwCf01DO.setFKZT(status);
        update(hlwCf01DO);
    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/YkyyController.java

@@ -66,6 +66,17 @@ public class YkyyController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "/update")
    @ApiOperation(value = "更新支付")
    public ListEnvelop udapte(@ApiParam(name = "id", value = "sql语句", required = true)
                                      @RequestParam(value = "id",required = true)String id,
                                      @ApiParam(name = "status", value = "状态", required = true)
                                      @RequestParam(value = "status",required = false)Integer status){
        return success(ykyyEntranceService.udapte(id,status));
    }
    @GetMapping(value = "/save")
    @ApiOperation(value = "保存01和02表")
    public ObjEnvelop save(@ApiParam(name = "json", value = "json", required = true)