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/PrescriptionService.java

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

@@ -6019,6 +6019,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("mobile", basePatientDO.getMobile());
        rs.put("photo", basePatientDO.getPhoto());
        rs.put("address", basePatientDO.getAddress());
        rs.put("cardType",basePatientDO.getCardType());
        if (patientMedicareCardDO != null) {
            rs.put("ssc", patientMedicareCardDO.getCode());
        } else {
@@ -10423,7 +10424,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return null;
    }
    public Map saveNatAppointment(String mediaCard,String patientId,String name,String cardNo,String cardType,String mobile,
                                   String firstJobCode,String firstJobName,String secondJobCode,String secondJobName,String natTime,String address,String provinceName,String cityName,String townName,String streetName){
                                   String firstJobCode,String firstJobName,String secondJobCode,String secondJobName,String natTime,String address,String provinceName,String cityName,String townName,String streetName) throws Exception {
        BaseNatAppointmentDO baseNatAppointmentDO= new BaseNatAppointmentDO();
        Map returnMap = new HashMap();
        net.sf.json.JSONObject jsondate = new JSONObject();
@@ -10628,7 +10629,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    e.printStackTrace();
                }
            }
            baseNatAppointmentDO.setMedicard(mediaCard);
            baseNatAppointmentDO.setMedicare(mediaCard);
            baseNatAppointmentDO.setName(name);
            baseNatAppointmentDO.setCardNo(cardNo);
            baseNatAppointmentDO.setCardType(cardType);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -2503,7 +2503,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success(entranceService.BS10143(day,demoFlag));
    }
    @GetMapping("/BS10144")
    public ListEnvelop BS10144(@ApiParam(name = "deptCode", value = "deptCode")
    public Envelop BS10144(@ApiParam(name = "deptCode", value = "deptCode")
                               @RequestParam(value = "deptCode",required = false)String deptCode,
                           @ApiParam(name = "docCode", value = "docCode")
                           @RequestParam(value = "docCode",required = false)String docCode,
@@ -2520,7 +2520,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return success(entranceService.BS10144(deptCode,docCode,startTime,sSID,patientName,patientID,patientPhone,demoFlag));
    }
    @GetMapping("/BS10145")
    public ListEnvelop BS10145(@ApiParam(name = "deptCode", value = "deptCode")
    public Envelop BS10145(@ApiParam(name = "deptCode", value = "deptCode")
                               @RequestParam(value = "deptCode",required = false)String deptCode,
                           @ApiParam(name = "docCode", value = "docCode")
                               @RequestParam(value = "docCode",required = false)String docCode,
@@ -2538,39 +2538,43 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping("/saveNatAppointment")
    @ApiOperation(value = "核酸检测预约接口")
    public Envelop saveNatAppointment(@ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String mediaCard,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String patientId,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String name,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String cardNo,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String cardType,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String mobile,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String firstJobCode,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String firstJobName,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String secondJobCode,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String secondJobName,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String natTime,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String address,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String provinceName,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String cityName,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String townName,
                                      @ApiParam(name = "deptCode", value = "deptCode")
                                      @RequestParam(value = "deptCode",required = false)String streetName){
        return success(prescriptionService.saveNatAppointment(mediaCard,patientId,name,cardNo,cardType,mobile,firstJobCode,firstJobName,secondJobCode,secondJobName,natTime,address,provinceName,cityName,townName,streetName));
    public Envelop saveNatAppointment(@ApiParam(name = "mediaCard", value = "mediaCard")
                                          @RequestParam(value = "mediaCard",required = false)String mediaCard,
                                      @ApiParam(name = "patientId", value = "patientId")
                                          @RequestParam(value = "patientId",required = false)String patientId,
                                      @ApiParam(name = "name", value = "name")
                                          @RequestParam(value = "name",required = false)String name,
                                      @ApiParam(name = "cardNo", value = "cardNo")
                                          @RequestParam(value = "cardNo",required = false)String cardNo,
                                      @ApiParam(name = "cardType", value = "cardType")
                                          @RequestParam(value = "cardType",required = false)String cardType,
                                      @ApiParam(name = "mobile", value = "mobile")
                                          @RequestParam(value = "mobile",required = false)String mobile,
                                      @ApiParam(name = "firstJobCode", value = "firstJobCode")
                                          @RequestParam(value = "firstJobCode",required = false)String firstJobCode,
                                      @ApiParam(name = "firstJobName", value = "firstJobName")
                                          @RequestParam(value = "firstJobName",required = false)String firstJobName,
                                      @ApiParam(name = "secondJobCode", value = "secondJobCode")
                                          @RequestParam(value = "secondJobCode",required = false)String secondJobCode,
                                      @ApiParam(name = "secondJobName", value = "secondJobName")
                                          @RequestParam(value = "secondJobName",required = false)String secondJobName,
                                      @ApiParam(name = "natTime", value = "natTime")
                                          @RequestParam(value = "natTime",required = false)String natTime,
                                      @ApiParam(name = "address", value = "address")
                                          @RequestParam(value = "address",required = false)String address,
                                      @ApiParam(name = "provinceName", value = "provinceName")
                                          @RequestParam(value = "provinceName",required = false)String provinceName,
                                      @ApiParam(name = "cityName", value = "cityName")
                                          @RequestParam(value = "cityName",required = false)String cityName,
                                      @ApiParam(name = "townName", value = "townName")
                                          @RequestParam(value = "townName",required = false)String townName,
                                      @ApiParam(name = "streetName", value = "streetName")
                                          @RequestParam(value = "streetName",required = false)String streetName){
        try {
            return success(prescriptionService.saveNatAppointment(mediaCard,patientId,name,cardNo,cardType,mobile,firstJobCode,firstJobName,secondJobCode,secondJobName,natTime,address,provinceName,cityName,townName,streetName));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }
    }