Jelajahi Sumber

广告投放设备,续方订单添加字段

chenjiasheng 3 tahun lalu
induk
melakukan
efa960dd17

+ 13 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@ -41,6 +41,8 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
     */
    private Date prescribeTime;
    /**
     * 处方号
     */
@ -203,7 +205,18 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private String userId;
    /*门店编号*/
    private String shopNo;
    /*
    社保卡号
     */
    private String socialSecurityCardNum;
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public String getUserId() {
        return userId;

+ 20 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorderdetail.java

@ -201,6 +201,26 @@ public class Mediicineorderdetail extends UuidIdentityEntityWithOperator impleme
    private String useWayAdd;
    private String manufactor;
    private String socialSecurityCardNum;
    private String orgCode;
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getSocialSecurityCardNum() {
        return socialSecurityCardNum;
    }
    public void setSocialSecurityCardNum(String socialSecurityCardNum) {
        this.socialSecurityCardNum = socialSecurityCardNum;
    }
    public Float getDrugNum() {
        return drugNum;
    }

+ 24 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/dao/advertisement/AdvertisementLaunchDAO.java

@ -1,11 +1,35 @@
package com.yihu.jw.base.dao.advertisement;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface AdvertisementLaunchDAO extends PagingAndSortingRepository<AdvertisementLaunchDO, String>, JpaSpecificationExecutor<AdvertisementLaunchDO> {
    @Query(value = "delete from AdvertisementLaunchDO a where a.advId=?1")
    @Modifying
    @Transactional
    void deleteByAdvId(String advId);
    List<AdvertisementLaunchDO> findByAdvId(String advId);
    List<AdvertisementLaunchDO> findByDevId(String devId);
    AdvertisementLaunchDO findByAdvIdAndDevId(String advId,String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join AdvertisementPuttingAdminDO b on a.advId=b.id where a.devId=?1")
    List<AdvertisementPuttingAdminDO> findByDevIdInfo(String devId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where a.advId=?1")
    List<Mediicinedevice> findByAdvIdInfo(String advId);
    @Query(value = "select b from AdvertisementLaunchDO a join Mediicinedevice b on a.devId=b.id where b.machineCode=?1")
    Mediicinedevice findByMachineCode(String machineCode);
}

+ 103 - 10
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@ -2,9 +2,12 @@ package com.yihu.jw.base.endpoint.adv;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.service.advrtisement.AdvertisementLaunchService;
import com.yihu.jw.base.service.advrtisement.AdvrtisementService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.restmodel.advertisement.AdvertisementPuttingAdminVO;
import com.yihu.jw.restmodel.web.Envelop;
@ -15,7 +18,7 @@ import com.yihu.jw.rm.adv.AdvsementMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -32,7 +35,8 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    AdvrtisementService advrtisementService;
    @Autowired
    AdvertisementLaunchService launchService;
    @Autowired
    MedicinedeviceService medicinedeviceService;
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.DELADVERTISEMENT)
    @ApiOperation(value = "删除广告")
@ -57,20 +61,27 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.LAUNCHADVERTISEMENT )
    @ApiOperation(value = "投放广告")
    public Envelop launchAdvertisement(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
                                          @RequestParam(value = "advIds",required = true) String advIds,
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开",required = true)
                                      @RequestParam(value = "ids",required = true)String devIds){
                                      @ApiParam(name = "devIds",value = "设备id,多个中间用,隔开,所有设备不传",required = true)
                                      @RequestParam(value = "ids",required = false)String devIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在!");
        }
        if (StringUtils.isBlank(devIds)){
            return failed("请选择要投放到的设备");
        }
        return success(advrtisementService.updateLaunchStatus(advIds,devIds));
    }
    @GetMapping(value = "/unlaunch")
    @ApiOperation(value = "取消投放广告")
    public Envelop unLaunch(@ApiParam(name = "advIds",value = "广告id,多个中间用,隔开")
                            @RequestParam(value = "advIds",required = true)String advIds){
        if (StringUtils.isBlank(advIds)){
            return failed("请确认该广告是否存在!");
        }
        return success(advrtisementService.unLaunch(advIds));
    }
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.FORBIDDENADVERTISEMENT)
    @ApiOperation(value = "禁用广告")
@ -117,8 +128,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SELECTLike)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<AdvertisementPuttingAdminVO> page(
    public ListEnvelop<AdvertisementPuttingAdminDO> page(
            @ApiParam(name = "fields",value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields",required = false)String fields,
            @ApiParam(name = "filters",value = "过滤器,为空检索所有条件")
@ -126,7 +136,90 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "sorts",value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts",required = false)String sorts) throws ParseException {
        List<AdvertisementPuttingAdminDO>list=advrtisementService.search(fields,filters,sorts);
        return success(list, AdvertisementPuttingAdminVO.class);
        return success(list, AdvertisementPuttingAdminDO.class);
    }
    @GetMapping(value = "/all")
    @ApiOperation(value = "获取全部投放信息")
    public ListEnvelop<AdvertisementLaunchDO> all(
            @ApiParam(name = "fields",value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields",required = false)String fields,
            @ApiParam(name = "filters",value = "过滤器,为空检索所有条件")
            @RequestParam(name = "filters",required = false)String filters,
            @ApiParam(name = "sorts",value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts",required = false)String sorts) throws ParseException{
        List<AdvertisementLaunchDO> list=launchService.search(fields, filters, sorts);
        return success(list,AdvertisementLaunchDO.class);
    }
    @GetMapping(value = "/allpage")
    @ApiOperation(value = "分页查询广告投放设备信息")
    public PageEnvelop<AdvertisementLaunchDO> allPage (
            @ApiParam(name = "fields", value = "返回的字段,为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器,为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序,规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<AdvertisementLaunchDO> list = launchService.search(fields, filters, sorts, page, size);
        int count = (int)launchService.getCount(filters);
        return success(list, count, page, size, AdvertisementLaunchDO.class);
    }
    @GetMapping(value = "/one")
    @ApiOperation(value = "单条广告投放到的全部设备")
    public ListEnvelop<AdvertisementLaunchDO> one(
            @ApiParam(name = "advId",value = "广告id")
            @RequestParam(value = "advId",required = true)String advId){
        List<AdvertisementLaunchDO> list=launchService.one(advId);
        if (list==null||list.size()==0){
            return failedListEnvelopException(new Exception("请查看广告ID是否正确"));
        }
        return success("获取单条广告投放设备成功",list);
    }
    @GetMapping(value = "/open/info")
    @ApiOperation(value = "获取单个设备上的所有广告")
    public ListEnvelop<AdvertisementLaunchDO>solo(
            @ApiParam(name = "machineCode",value = "设备编码")
            @RequestParam(value = "machineCode",required = true)String machineCode){
        return success(launchService.solo(machineCode));
    }
    @GetMapping(value = "/info")
    @ApiOperation(value = "获取单个设备上的所有广告明细")
    public Envelop info(
            @ApiParam(name = "devId",value = "设备id")
            @RequestParam(value = "devId",required = true)String devId){
        List<AdvertisementPuttingAdminDO>list=launchService.info(devId);
        if (list==null||list.size()==0){
            return failed("该设备没有广告或者该设备id不存在");
        }
        return success("获取单个设备上所有广告明细成功",list);
    }
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单条广告投放的所有设备明细")
    public Envelop devInfo(@ApiParam(name = "advId",value = "广告id")
                               @RequestParam(value = "advId",required = true)String advId) {
        List<AdvertisementLaunchDO> list = launchService.one(advId);
        if (list==null||list.size()==0){
            return failed("该广告未投放或者广告id错误");
        }
        List<Mediicinedevice> mediicinedeviceList=launchService.devInfo(advId);
        return success("获取单条广告所有投放设备明细成功",mediicinedeviceList);
    }
    @GetMapping(value = "selectdev")
    @ApiOperation(value = "投放广告可选择的设备")
    public ListEnvelop<Mediicinedevice> selectDev(){
        Iterable<Mediicinedevice> iterable=medicinedeviceService.findAll();
        List<Mediicinedevice> list= IterableUtils.toList(iterable);
        return success("所有设备获取成功",list);
    }
}

+ 21 - 15
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@ -46,29 +46,31 @@ public class MedOrderService {
            mediicineorder.setSex(sex);
            String equNum=params.getString("device_no");
            mediicineorder.setEquNum(equNum);
            String name=params.getString(" rx_patient_name");
            String name=params.getString("rx_patient_name");
            mediicineorder.setName(name);
            String age=params.getString(" rx_patient_age");
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setAddress(params.getString(" rx_patient_address"));
            mediicineorder.setContact(params.getString(" rx_patient_phone"));
            mediicineorder.setIdNum(params.getString(" rx_patient_identity"));
            mediicineorder.setOrderType(params.getString(" rx_type"));
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setOrderType(params.getString("rx_type"));
            mediicineorder.setOrderState(params.getString("rx_state"));
            mediicineorder.setAttr(params.getString(" rx_attr"));
            mediicineorder.setAttr(params.getString("rx_attr"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setPrescribeTime(params.getDate("rx_time"));
            mediicineorder.setBirth(params.getDate("rx_patient_birth"));
            mediicineorder.setInfo(params.getString("rx_diagnosis_info"));
            mediicineorder.setHospitalInfo(params.getString(" rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString(" rx_department_no"));
            mediicineorder.setDeptName(params.getString(" rx_department_name"));
            mediicineorder.setHospitalInfo(params.getString("rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString("rx_department_no"));
            mediicineorder.setDeptName(params.getString("rx_department_name"));
            mediicineorder.setDoctorNum(params.getString("rx_doctor_no"));
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString(" rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString(" rx_allergy_info"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
@ -82,13 +84,17 @@ public class MedOrderService {
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicineorderdetail.setUseWay(jsonObject.getString(" drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString(" drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString(" drug_use_dose"));
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString(" drug_firm_name"));
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);

+ 4 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@ -1205,4 +1205,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return list;
    }
    //获取所有设备
    public Iterable<Mediicinedevice> findAll() {
        return deviceDao.findAll();
    }
}

+ 21 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvertisementLaunchService.java

@ -1,13 +1,34 @@
package com.yihu.jw.base.service.advrtisement;
import com.yihu.jw.base.dao.advertisement.AdvertisementLaunchDAO;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class AdvertisementLaunchService extends BaseJpaService<AdvertisementLaunchDO, AdvertisementLaunchDAO> {
    @Autowired
    AdvertisementLaunchDAO advertisementLaunchDAO;
    public List<AdvertisementLaunchDO> one(String advId) {
        return advertisementLaunchDAO.findByAdvId(advId);
    }
    public List<AdvertisementLaunchDO> solo(String machineCode) {
        Mediicinedevice mediicinedevice = advertisementLaunchDAO.findByMachineCode(machineCode);
        return advertisementLaunchDAO.findByDevId(mediicinedevice.getId());
    }
    public List<AdvertisementPuttingAdminDO> info(String devId) {
        return advertisementLaunchDAO.findByDevIdInfo(devId);
    }
    public List<Mediicinedevice> devInfo(String advId) {
        return advertisementLaunchDAO.findByAdvIdInfo(advId);
    }
}

+ 54 - 25
svr/svr-base/src/main/java/com/yihu/jw/base/service/advrtisement/AdvrtisementService.java

@ -3,10 +3,13 @@ package com.yihu.jw.base.service.advrtisement;
import com.alibaba.fastjson.JSONObject;
import com.ibm.disthub2.impl.formats.Envelop;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.advertisement.AdvertisementLaunchDAO;
import com.yihu.jw.base.dao.advertisement.AdvertisementPuttingAdminDAO;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.adv.AdvertisementLaunchDO;
import com.yihu.jw.entity.adv.AdvertisementPuttingAdminDO;
import com.yihu.jw.entity.base.user.UserDO;
@ -14,6 +17,7 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,6 +37,8 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
    WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    AdvertisementLaunchDAO launchDAO;
    @Autowired
    private MediicineDeviceDao deviceDao;
    //按照分页查询
@ -61,6 +67,7 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        }
        if (advertisementExist(id).getDel()==0) {
            advertisementPuttingAdminDAO.updateDelStatusTo1(id);
            launchDAO.deleteByAdvId(id);
            return "删除成功";
        }else {
            advertisementPuttingAdminDAO.updateDelStatus(id);
@ -71,32 +78,50 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
    //投放
    public String updateLaunchStatus(String advIds, String devIds){
        String[] strings=advIds.split(",");
        List<AdvertisementLaunchDO> list=new ArrayList<>();
        List<AdvertisementLaunchDO> list = new ArrayList<>();
        AdvertisementLaunchDO launchDO;
        for (int i = 0; i <strings.length ; i++) {
            if (advertisementExist(strings[i])==null) {
                return  "广告id:"+strings[i]+"不存在!";
            }
            if (advertisementExist(strings[i]).getDel()==1){
                return "广告id:"+strings[i]+"已删除!";
            }
            if (advertisementExist(strings[i]).getForbidden()==1){
                return "广告id:"+strings[i]+"已禁用!";
            }
            if (advertisementExist(strings[i]).getLaunch()==1){
                advertisementPuttingAdminDAO.updateLaunStatus(strings[i]);
                String[] str=devIds.split(",");
                for (int j = 0; j <str.length ; i++) {
                    launchDO=new AdvertisementLaunchDO();
        String[] strings=advIds.split(",");
        if (devIds!=null) {
            String[] str = devIds.split(",");
            for (int i = 0; i < strings.length; i++) {
                if (advertisementExist(strings[i]) == null) {
                    return "广告id:" + strings[i] + "不存在!";
                }
                if (advertisementExist(strings[i]).getDel() == 1) {
                    return "广告id:" + strings[i] + "已删除!";
                }
                if (advertisementExist(strings[i]).getForbidden() == 1) {
                    return "广告id:" + strings[i] + "已禁用!";
                }
                for (int j = 0; j < str.length; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
                }
                return "已取消投放!";
            }else {
                advertisementPuttingAdminDAO.updateLaunStatusTo1(strings[i]);
                return "已投放广告!";
                for (int j = 0; j < str.length; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setAdvId(strings[i]);
                    launchDO.setDevId(str[j]);
                    list.add(launchDO);
                }
            }
            launchDAO.save(list);
        }else {
            Iterable<Mediicinedevice> iterable = deviceDao.findAll();
            List<Mediicinedevice> mediicinedevices=IterableUtils.toList(iterable);
            for (int i = 0; i <mediicinedevices.size() ; i++) {
                for (int j = 0; j <strings.length ; i++) {
                    launchDO = new AdvertisementLaunchDO();
                    launchDO.setDevId(mediicinedevices.get(i).getId());
                    launchDO.setAdvId(strings[j]);
                    list.add(launchDO);
                }
            }
            launchDAO.save(list);
        }
        return null;
        return "已投放广告";
    }
    //禁用
@ -110,9 +135,10 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
        if (advertisementExist(id).getForbidden()==0) {
           // SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            advertisementPuttingAdminDAO.updateForbiddenStatusTo1(id);
            launchDAO.deleteByAdvId(id);
            return "广告已禁用";
        }else {
            advertisementPuttingAdminDAO.updateForbiddenStatus( id);
            advertisementPuttingAdminDAO.updateForbiddenStatus(id);
            return "广告已解禁";
        }
    }
@ -198,9 +224,12 @@ public class AdvrtisementService extends BaseJpaService<AdvertisementPuttingAdmi
    }
    public List<WlyyHospitalSysDictDO> set() {
        return wlyyHospitalSysDictDao.findByDictName("play_interval");
    public String unLaunch(String advIds) {
        String[] str=advIds.split(",");
        for (int i = 0; i <str.length ; i++) {
            launchDAO.deleteByAdvId(str[i]);
        }
        return "删除成功";
    }

+ 2 - 3
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/mediicine/MedicineOrderDrugsEndpoint.java

@ -1,10 +1,9 @@
package com.yihu.jw.hospital.endpoint.mediicine;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicineorder;
import com.yihu.jw.entity.a1entity.Mediicineorderdetail;
import com.yihu.jw.hospital.service.MedOrderService;
import com.yihu.jw.hospital.service.med.MedOrderService;
import com.yihu.jw.hospital.service.med.MedicineDrugsService;
import com.yihu.jw.restmodel.web.Envelop;

+ 24 - 20
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MedOrderService.java

@ -1,4 +1,4 @@
package com.yihu.jw.hospital.service;
package com.yihu.jw.hospital.service.med;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -18,9 +18,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
;
@Transactional
@Service
public class MedOrderService {
@ -49,29 +46,31 @@ public class MedOrderService {
            mediicineorder.setSex(sex);
            String equNum=params.getString("device_no");
            mediicineorder.setEquNum(equNum);
            String name=params.getString(" rx_patient_name");
            String name=params.getString("rx_patient_name");
            mediicineorder.setName(name);
            String age=params.getString(" rx_patient_age");
            String age=params.getString("rx_patient_age");
            mediicineorder.setAge(age);
            mediicineorder.setUserId(params.getString("user_id"));
            mediicineorder.setShopNo(params.getString("shop_no"));
            mediicineorder.setAddress(params.getString(" rx_patient_address"));
            mediicineorder.setContact(params.getString(" rx_patient_phone"));
            mediicineorder.setIdNum(params.getString(" rx_patient_identity"));
            mediicineorder.setOrderType(params.getString(" rx_type"));
            mediicineorder.setPrescribeNum(params.getString("rx_no"));
            mediicineorder.setAddress(params.getString("rx_patient_address"));
            mediicineorder.setContact(params.getString("rx_patient_phone"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setOrderType(params.getString("rx_type"));
            mediicineorder.setOrderState(params.getString("rx_state"));
            mediicineorder.setAttr(params.getString(" rx_attr"));
            mediicineorder.setAttr(params.getString("rx_attr"));
            mediicineorder.setIdNum(params.getString("rx_patient_identity"));
            mediicineorder.setPrescribeTime(params.getDate("rx_time"));
            mediicineorder.setBirth(params.getDate("rx_patient_birth"));
            mediicineorder.setInfo(params.getString("rx_diagnosis_info"));
            mediicineorder.setHospitalInfo(params.getString(" rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString(" rx_department_no"));
            mediicineorder.setDeptName(params.getString(" rx_department_name"));
            mediicineorder.setHospitalInfo(params.getString("rx_hospital_info"));
            mediicineorder.setDeptNum(params.getString("rx_department_no"));
            mediicineorder.setDeptName(params.getString("rx_department_name"));
            mediicineorder.setDoctorNum(params.getString("rx_doctor_no"));
            mediicineorder.setDeptName(params.getString("rx_doctor_name"));
            mediicineorder.setDoctorAdvice(params.getString(" rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString(" rx_allergy_info"));
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            Mediicineorder ord=mediicineorderDao.save(mediicineorder);
            JSONArray jsonArray=params.getJSONArray("rx_drugs");
            List<Mediicineorderdetail> mediicineorderdetailList=new ArrayList<>();
@ -85,13 +84,18 @@ public class MedOrderService {
                mediicineorderdetail.setDrugNum(jsonObject.getFloat("drug_num"));
                mediicineorderdetail.setPrice(jsonObject.getFloat("drug_price"));
                mediicineorderdetail.setUseNum(jsonObject.getFloat("drug_use_num"));
                mediicineorderdetail.setUseWay(jsonObject.getString(" drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString(" drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString(" drug_use_dose"));
                mediicineorderdetail.setUseWay(jsonObject.getString("drug_use_way"));
                mediicineorderdetail.setUseRate(jsonObject.getString("drug_use_rate"));
                mediicineorderdetail.setUseDose(jsonObject.getString("drug_use_dose"));
                mediicineorderdetail.setUnit(jsonObject.getString("drug_use_unit"));
                mediicineorderdetail.setUseWayAdd(jsonObject.getString("drug_use_way_add"));
                mediicineorderdetail.setManufactor(jsonObject.getString(" drug_firm_name"));
                mediicineorderdetail.setManufactor(jsonObject.getString("drug_firm_name"));
                mediicineorderdetail.setGoodsName(jsonObject.getString("drug_name"));
                mediicineorderdetail.setOrgCode(jsonObject.getString("org_code"));
                mediicineorderdetail.setIdOrder(ord.getId());
                mediicineorderdetail.setIdNum(ord.getIdNum());
                mediicineorderdetail.setOrderNo(ord.getOrderNum());
                mediicineorderdetail.setSocialSecurityCardNum(ord.getSocialSecurityCardNum());
                mediicineorderdetailList.add(mediicineorderdetail);
            }
            Iterable<Mediicineorderdetail>mediicineorderdetails= mediicineorderdetailDao.save(mediicineorderdetailList);